diff options
| -rw-r--r-- | perform/sio_engine.c | 25 | ||||
| -rw-r--r-- | perform/sio_perf.c | 9 |
2 files changed, 14 insertions, 20 deletions
diff --git a/perform/sio_engine.c b/perform/sio_engine.c index b3a5b2a..bcddfdc 100644 --- a/perform/sio_engine.c +++ b/perform/sio_engine.c @@ -79,21 +79,6 @@ static int clean_file_g = -1; /*whether to cleanup temporary test */ /*files. -1 is not defined; */ /*0 is no cleanup; 1 is do cleanup */ -/* - * In a parallel machine, the filesystem suitable for compiling is - * unlikely a parallel file system that is suitable for parallel I/O. - * There is no standard pathname for the parallel file system. /tmp - * is about the best guess. - */ -#ifndef HDF5_PARAPREFIX -# ifdef __PUMAGON__ -/* For the PFS of TFLOPS */ -# define HDF5_PARAPREFIX "pfs:/pfs_grande/multi/tmp_1" -# else -# define HDF5_PARAPREFIX "" -# endif /* __PUMAGON__ */ -#endif /* !HDF5_PARAPREFIX */ - #ifndef MIN # define MIN(a,b) ((a) < (b) ? (a) : (b)) #endif /* !MIN */ @@ -357,16 +342,16 @@ sio_create_filename(iotype iot, const char *base_name, char *fullname, size_t si } /* First use the environment variable and then try the constant */ - prefix = getenv("HDF5_PARAPREFIX"); + prefix = getenv("HDF5_PREFIX"); -#ifdef HDF5_PARAPREFIX +#ifdef HDF5_PREFIX if (!prefix) - prefix = HDF5_PARAPREFIX; -#endif /* HDF5_PARAPREFIX */ + prefix = HDF5_PREFIX; +#endif /* HDF5_PREFIX */ /* Prepend the prefix value to the base name */ if (prefix && *prefix) { - /* If the prefix specifies the HDF5_PARAPREFIX directory, then + /* If the prefix specifies the HDF5_PREFIX directory, then * default to using the "/tmp/$USER" or "/tmp/$LOGIN" * directory instead. */ register char *user, *login, *subdir; diff --git a/perform/sio_perf.c b/perform/sio_perf.c index a83e4ab..389d6f0 100644 --- a/perform/sio_perf.c +++ b/perform/sio_perf.c @@ -919,6 +919,14 @@ report_parameters(struct options *opts) HDfprintf(output, "direct\n"); } } + + { + char *prefix = getenv("HDF5_PREFIX"); + + HDfprintf(output, "Env HDF5_PREFIX=%s\n", + (prefix ? prefix : "not set")); + } + HDfprintf(output, "==== End of Parameters ====\n"); HDfprintf(output, "\n"); } @@ -1408,6 +1416,7 @@ usage(const char *prog) printf("\n"); printf(" Environment variables:\n"); printf(" HDF5_NOCLEANUP Do not remove data files if set [default remove]\n"); + printf(" HDF5_PREFIX Data file prefix\n"); printf("\n"); fflush(stdout); } |