Compilation without HDF5 #67
Conversation
via configure script and pre-processor macros
Makefile.am
Outdated
| src/trexio_text.c \ | ||
| src/trexio_text.h | ||
|
|
||
| if DO_HDF5 |
There was a problem hiding this comment.
Can you change it to HAVE_HDF5 to be consistent with config.h?
Makefile.am
Outdated
| tests/overwrite_all_text \ | ||
| tests/io_all | ||
|
|
||
| if DO_HDF5 |
configure.ac
Outdated
| @@ -119,6 +115,8 @@ AC_SUBST([PKG_HDF5]) | |||
| AC_SUBST([PKG_CFLAGS]) | |||
| AC_SUBST([PKG_LIBS]) | |||
|
|
|||
| AM_CONDITIONAL([DO_HDF5],[test "$with_hdf5" = "yes"]) | |||
| integer(trexio_backend), parameter :: TREXIO_HDF5 = 0 | ||
| integer(trexio_backend), parameter :: TREXIO_TEXT = 1 | ||
| integer(trexio_backend), parameter :: TREXIO_TEXT = 0 | ||
| integer(trexio_backend), parameter :: TREXIO_HDF5 = 1 | ||
| ! integer(trexio_backend), parameter :: TREXIO_JSON = 2 | ||
| integer(trexio_backend), parameter :: TREXIO_INVALID_BACK_END = 2 |
There was a problem hiding this comment.
Here the Fortran is inconsistent with the C for the invalid back-end. The simplest would be to keep the TREXIO_HDF5=1 even if HDF5 is not present.
There was a problem hiding this comment.
Done. Also reverted TREXIO_HDF5 to 0 and TREXIO_TEXT to 1 since no need to swap them now.
| @@ -739,9 +754,11 @@ trexio_open(const char* file_name, const char mode, | |||
| result_tmp = malloc(sizeof(trexio_text_t)); | |||
| break; | |||
|
|
|||
| #ifdef HAVE_HDF5 | |||
There was a problem hiding this comment.
Here, you can do:
case TREXIO_HDF5:
#ifdef HAVE_HDF5
result_tmp = malloc(sizeof(trexio_hdf5_t));
break;
#else
if (rc_open != NULL) *rc_open = TREXIO_INVALID_ARG_3;
return NULL;
#endif
and keep TREXIO_HDF5=1
There was a problem hiding this comment.
Done. Also added new exit code TREXIO_BACK_END_MISSING for better error handling.
| call system('rm -rf test_write_f.h5') | ||
|
|
||
| call test_read_void('test_write_f.h5', TREXIO_HDF5) | ||
| ! No way to conditionally check whether compilation was done with HDF5 |
There was a problem hiding this comment.
You can make a function:
bool trexio_has_backend(int back_end) {
switch (back_end) {
case TREXIO_TEXT:
return true;
case TREXIO_HDF5:
#ifdef HAVE_HDF5
return true;
#else
return false;
#endif
}
return false;
}
There was a problem hiding this comment.
Added this function to both C and Fortran APIs and to the corresponding tests.
Introduced optional calls to HDF5 back end using the
#ifdef HAVE_HDF5pre-processor macro, which value is defined byconfigurescript inconfig.hfile.By default,
./configureproceeds to search for the HDF5 library. To disable this, provide--without-hdf5argument. For example,./configure --without-hdf5