fixing cmake benchmarks, also removing unneeded run_bm.sh

nc_test4/CMakeLists.txt

@@ -62,7 +62,7 @@ IF(BUILD_BENCHMARKS)
   add_sh_test(nc_test4 run_bm_test2)
   add_sh_test(nc_test4 run_tst_chunks)
   add_sh_test(nc_test4 run_bm_ar4)
-  add_sh_test(nc_test4 run_get_knmi_files)
+  add_sh_test(nc_test4 run_knmi_bm)
 
   SET(NC4_TESTS ${NC4_TESTS} tst_create_files bm_file tst_chunks3 tst_ar4 tst_ar4_3d tst_ar4_4d bm_many_objs tst_h_many_atts bm_many_atts tst_files2 tst_files3 tst_h_files3 tst_mem tst_knmi bm_netcdf4_recs)
   IF(TEST_PARALLEL)

nc_test4/Makefile.am

@@ -125,17 +125,16 @@ check_PROGRAMS += bigmeta openbigmeta tst_attsperf
 TESTS += tst_attsperf perftest.sh
 endif
 
-EXTRA_DIST = run_par_test.sh.in run_bm.sh run_bm_test1.sh		\
-run_bm_test2.sh run_par_bm_test.sh run_bm_elena.sh run_tst_chunks.sh	\
-ref_chunks1.cdl run_bm_ar4.sh ref_tst_compounds.nc			\
-ref_tst_xplatform2_1.nc ref_tst_xplatform2_2.nc ref_tst_dims.nc		\
-ref_tst_interops4.nc run_knmi_bm.sh CMakeLists.txt run_grp_rename.sh	\
-tst_h5_endians.c tst_atts_string_rewrite.c				\
-tst_put_vars_two_unlim_dim.c tst_empty_vlen_unlim.c			\
-run_empty_vlen_test.sh ref_hdf5_compat1.nc ref_hdf5_compat2.nc		\
-ref_hdf5_compat3.nc tst_misc.sh tdset.h5 tst_szip.sh ref_szip.h5	\
-ref_szip.cdl tst_filter.sh bzip2.cdl filtered.cdl unfiltered.cdl	\
-ref_bzip2.c findplugin.in perftest.sh
+EXTRA_DIST = run_par_test.sh.in run_bm_test1.sh run_bm_test2.sh		\
+run_par_bm_test.sh run_bm_elena.sh run_tst_chunks.sh ref_chunks1.cdl	\
+run_bm_ar4.sh ref_tst_compounds.nc ref_tst_xplatform2_1.nc		\
+ref_tst_xplatform2_2.nc ref_tst_dims.nc ref_tst_interops4.nc		\
+run_knmi_bm.sh CMakeLists.txt run_grp_rename.sh tst_h5_endians.c	\
+tst_atts_string_rewrite.c tst_put_vars_two_unlim_dim.c			\
+tst_empty_vlen_unlim.c run_empty_vlen_test.sh ref_hdf5_compat1.nc	\
+ref_hdf5_compat2.nc ref_hdf5_compat3.nc tst_misc.sh tdset.h5		\
+tst_szip.sh ref_szip.h5 ref_szip.cdl tst_filter.sh bzip2.cdl		\
+filtered.cdl unfiltered.cdl ref_bzip2.c findplugin.in perftest.sh
 
 CLEANFILES = tst_mpi_parallel.bin cdm_sea_soundings.nc bm_chunking.nc	\
 tst_floats_1D.cdl floats_1D_3.nc floats_1D.cdl tst_*.nc			\

nc_test4/run_bm.sh

@@ -1,93 +0,0 @@
-#!/bin/sh
-
-if test "x$srcdir" = x ; then srcdir=`pwd`; fi
-. ../test_common.sh
-
-# This shell runs a bunch of benchmarks on some specific files
-# available at Unidata.
-
-# $Id: run_bm.sh,v 1.8 2007/11/30 16:45:33 ed Exp $
-
-set -e
-
-# Radar 2D file. Make sure we have a local disk copy. Not much point
-# in benchmarking read and write times over NFS!
-TMP=/shecky/data
-d1=20070803-2300
-echo "howdy!"
-ls $TMP/${d1}-2d.nc3
-if ! test -f $TMP/${d1}-2d.nc3; then
-    cp /upc/share/testdata/nssl/mosaic2d_nc/tile1/$d1.netcdf $TMP/$d1-2d.nc3
-fi
-
-# Copy the 2D rarar file into a netCDF-4 version, with various
-# compression settings.
-out1=radar_2d_compression.txt
-c0=100
-c1=200
-h=-h
-for ((s=0; s < 2 ; s++))
-do
-    for ((d=0; d <= 9 ; d=d+2))
-    do
-	cmd="${execdir}/bm_file $h -f 3 -o $TMP/$d1-2d.nc4 -c 0:${d}:${s}:${c0}:${c1}"
-	for ((v=1; v < 12; v++))
-	do
-	    cmd="$cmd,${v}:${d}:${s}:${c0}:${c1}"
-	done
-	cmd="$cmd $TMP/$d1-2d.nc3"
-	echo "cmd=$cmd"
- 	if ! ($cmd >> $out1); then
- 	    exit 1;
- 	fi
-	h=
-    done
-done
-
-exit 0
-
-# Get local copy of the radar 3D file.
-d1=20070803-2300
-if ! test -f $TMP/${d1}-3d.nc3; then
-    cp /upc/share/testdata/nssl/mosaic3d_nc/tile1/20070803-2300.netcdf $TMP/${d1}-3d.nc3
-fi
-
-# Test different compressions, with and without shuffle.
-out1=radar_3d_compression.txt
-c0=3
-c1=100
-c2=200
-h=-h
-for ((s=0; s < 2 ; s++))
-do
-    for ((d=0; d <= 9 ; d++))
-    do
-	cmd="${execdir}/bm_file $h -f 3 -o $TMP/$d1.nc4 -c 0:${d}:${s}:${c0}:${c1}:${c2} $TMP/$d1.nc3"
-	echo "cmd=$cmd"
-	if ! ($cmd >> $out1); then
-	    exit 1;
-	fi
-	h=
-    done
-done
-
-# Try different chunk sizes with the same compession.
-out1=radar_3d_chunking.txt
-s=1
-d=3
-h=-h
-for c0 in 1 2 5
-do
-    for c1 in 10 100 200 500
-    do
-	for c3 in 10 100 200 500
-	do
-	    cmd="${execdir}/bm_file $h -f 3 -o $TMP/$d1.nc4 -c 0:${d}:${s}:${c0}:${c1}:${c2} $TMP/$d1.nc3"
-	    echo "cmd=$cmd"
-	    if ! ($cmd >> $out1); then
-		exit 1;
-	    fi
-	    h=
-	done
-    done
-done