updated to hdf5-1.8.20 (Fedora 29) (56163305) · Commits · ww8it / module-environment

dealii/85

+1 −1

Original line number	Diff line number	Diff line
		@@ -9,5 +9,5 @@ module load p4est/2.0
		module load parmetis/4.0.3
		module load petsc/3.7.6a-lite
		module load trilinos/12.10.1-deal85-mpi
		module load hdf5/1.8.18-system-mpi
		module load hdf5/1.8.20-system-mpi
		module load dealii/8.5.1-tri-petsc-hdf5-mpi-dbg

+1 −1

Original line number	Diff line number	Diff line
		@@ -9,5 +9,5 @@ module load p4est/2.0
		module load parmetis/4.0.3
		module load petsc/3.7.6a-lite
		module load trilinos/12.10.1-deal85-mpi
		module load hdf5/1.8.18-system-mpi
		module load hdf5/1.8.20-system-mpi
		module load dealii/9.0.0-tri-petsc-hdf5-mpi-dbg

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,4 +2,4 @@
		##
		## version file for HDF5 Libraries
		##
		set ModulesVersion "1.8.18-system"
		No newline at end of file
		set ModulesVersion "1.8.20-system"

+19 −18

Original line number	Diff line number	Diff line
		#%Module
		#
		# HDF5 with GCC 6.4.1 compiler (no MPI)
		# HDF5 with GCC 8.2.1 compiler (no MPI)
		#
		set version 1.8.17
		set version 1.8.20
		proc ModulesHelp { } {
		global version
		puts stderr "\tSets up the environment variables for system HDF5 ( GCC 6.4.1, NO MPI )\n"
		puts stderr "\tSets up the environment variables for system HDF5 ( GCC 8.2.1, NO MPI )\n"
		puts stderr "\t- HDF5_BASE"
		puts stderr "\t- HDF5_LIBDIR"
		puts stderr "\t- HDF5_LIB"
		@@ -17,7 +17,7 @@ proc ModulesHelp { } {
		puts stderr "\t- PATH\n"
		}

		module-whatis "sets up the environment variables for system HDF5 $version ( GCC 6.4.1, NO MPI )\n"
		module-whatis "sets up the environment variables for system HDF5 $version ( GCC 8.2.1, NO MPI )\n"


		conflict hdf5
		@@ -32,6 +32,7 @@ setenv HDF5_LIB "-L$pkglibdir -lhdf5_hl -lhdf5"
		setenv HDF5_INCDIR $pkghome/include
		setenv HDF5_INC "-I$pkghome/include"
		setenv HDF5_F90_LIB "-L$pkglibdir -lhdf5hl_fortran -lhdf5_fortran"

		if { [ file exists $pkglibdir/libhdf5_cpp.so ] } {
		setenv HDF5_CPP_LIB "-L$pkglibdir -lhdf5_hl_cpp -lhdf5_cpp"
		}

+19 −19

Original line number	Diff line number	Diff line
		#%Module
		#
		# HDF5 with GCC 6.4.1 compiler ( MPI )
		# HDF5 with GCC 8.2.1 compiler ( MPI )
		#
		set version 1.8.17
		set version 1.8.20
		proc ModulesHelp { } {
		global version
		puts stderr "\tSets up the environment variables for system HDF5 ( GCC 6.4.1, MPI )\n"
		puts stderr "\tSets up the environment variables for system HDF5 ( GCC 8.2.1, MPI )\n"
		puts stderr "\t- HDF5_BASE"
		puts stderr "\t- HDF5_LIBDIR"
		puts stderr "\t- HDF5_LIB"
		@@ -17,7 +17,7 @@ proc ModulesHelp { } {
		puts stderr "\t- PATH\n"
		}

		module-whatis "sets up the environment variables for system HDF5 $version ( GCC 6.4.1, MPI )\n"
		module-whatis "sets up the environment variables for system HDF5 $version ( GCC 8.2.1, MPI )\n"

		conflict hdf5
		prereq mpi/openmpi-x86_64
		@@ -43,7 +43,7 @@ if { [ file exists $pkglibdir/libhdf5_cpp.so ] } {
		setenv HDF5_VERSION $version

		# NO, Never add /usr/bin to path, will remove system env from PATH when unloaded
		prepend-path LD_LIBRARY_PATH $pkglibdir
		prepend-path LD_LIBRARY_PATH ff$pkglibdir

		unset pkghome
		unset pkglibdir