-
Notifications
You must be signed in to change notification settings - Fork 701
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #14028 from boegel/20210917202853_new_pr_AmberTools20
fix AmberTools v20 easyconfig using intel/2020a toolchain
- Loading branch information
Showing
4 changed files
with
75 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
easybuild/easyconfigs/a/AmberTools/AmberTools-20_cmake-locate-netcdf.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
Ensure that CMake recurses available paths if the Fortran libs aren't available in the netCDF module | ||
|
||
James Carpenter 2021-01-23 | ||
--- amber20_src/cmake/jedbrown/FindNetCDF.cmake.orig 2020-04-28 02:19:51.000000000 +0100 | ||
+++ amber20_src/cmake/jedbrown/FindNetCDF.cmake 2021-01-25 11:41:47.005657000 +0000 | ||
@@ -52,6 +52,7 @@ | ||
|
||
macro (NetCDF_check_interface lang header libs) | ||
find_path (NetCDF_INCLUDES_${lang} NAMES ${header} HINTS "${NetCDF_INCLUDES}" NO_DEFAULT_PATH) | ||
+ find_path (NetCDF_INCLUDES_${lang} NAMES ${header} HINTS "${NetCDF_INCLUDES}") | ||
|
||
find_library (NetCDF_LIBRARIES_${lang} NAMES ${libs} HINTS "${NetCDF_lib_dirs}") | ||
|
21 changes: 21 additions & 0 deletions
21
easybuild/easyconfigs/a/AmberTools/AmberTools-20_fix_missing_MPI_LIBRARY_error.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
When using "usempi" there will be no MPI_xxx_LIBRARIES set and that causes | ||
import_libraries to error out. We know it is correct so comment out that | ||
FATAL_ERROR. | ||
|
||
Åke Sandgren, 2021-06-16 | ||
diff -ru AmberTools.orig/cmake/LibraryTracking.cmake AmberTools/cmake/LibraryTracking.cmake | ||
--- AmberTools.orig/cmake/LibraryTracking.cmake 2021-04-25 02:51:44.000000000 +0200 | ||
+++ AmberTools/cmake/LibraryTracking.cmake 2021-06-16 13:30:26.568317368 +0200 | ||
@@ -170,9 +170,9 @@ | ||
|
||
cmake_parse_arguments(IMP_LIBS "" "" "LIBRARIES;INCLUDES" ${ARGN}) | ||
|
||
- if("${IMP_LIBS_LIBRARIES}" STREQUAL "") | ||
- message(FATAL_ERROR "Incorrect usage. At least one LIBRARY should be provided.") | ||
- endif() | ||
+ #if("${IMP_LIBS_LIBRARIES}" STREQUAL "") | ||
+ # message(FATAL_ERROR "Incorrect usage. At least one LIBRARY should be provided.") | ||
+ #endif() | ||
|
||
if(NOT "${IMP_LIBS_UNPARSED_ARGUMENTS}" STREQUAL "") | ||
message(FATAL_ERROR "Incorrect usage. Extra arguments provided.") |
19 changes: 19 additions & 0 deletions
19
easybuild/easyconfigs/a/AmberTools/AmberTools-20_fix_xblas_missing_make_dependency.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
Fix a missing dependency in xblas causing problems when building with large -j | ||
|
||
Åke Sandgren, 2021-07-01 | ||
diff -ru amber20_src.orig/AmberTools/src/xblas/Makefile amber20_src/AmberTools/src/xblas/Makefile | ||
--- amber20_src.orig/AmberTools/src/xblas/Makefile 2020-01-02 18:26:09.000000000 +0100 | ||
+++ amber20_src/AmberTools/src/xblas/Makefile 2021-07-01 11:34:05.281580939 +0200 | ||
@@ -97,10 +97,10 @@ | ||
grep 'FAIL/TOTAL' testall.result >testall.summary | ||
cat testall.summary | ||
|
||
-common-lib: | ||
+common-lib: header | ||
cd $(SRC_DIR)/common && $(MAKE) | ||
|
||
-common-test-lib: | ||
+common-test-lib: header | ||
cd $(TEST_DIR)/common && $(MAKE) | ||
|
||
|