Skip to content

fix build of DIRAC 19.0 easyconfig with high compiler optimizations #13613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
boegel merged 1 commit into from
Aug 5, 2021
Merged

fix build of DIRAC 19.0 easyconfig with high compiler optimizations #13613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions easybuild/easyconfigs/d/DIRAC/DIRAC-19.0-intel-2020a-Python-2.7.18-int64.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,22 @@ sources = ['DIRAC-%(version)s-Source.tar.gz']
patches = [
'%(name)s-%(version)s_remove-broken-tests-intel.patch',
'%(name)s-%(version)s_fix-bss_energy_test.patch',
'%(name)s-%(version)s_use_easybuild_opts_intel.patch',
'%(name)s-%(version)s_use_easybuild_opts.patch',
'%(name)s-%(version)s_fix_test_path.patch',
]
checksums = [
'f0e3610bdd1fbcff90cdfb4cf3fd7582a4762f533af7d635c4bc4d114f402c32', # DIRAC-19.0-Source.tar.gz
'cb0e07097499fe59180d79a5db9ee883b9c83e16dcc6210fd945072c3a54c8a4', # DIRAC-19.0_remove-broken-tests-intel.patch
'e66be847d87ccfda23687de31a3a7c8d71c97b0accd290cf7ade4b4184f1fb93', # DIRAC-19.0_fix-bss_energy_test.patch
'666a9053d6c1287ee7aa471d18436133931959b3eacb7619d5197dbfb4e0c1fe', # DIRAC-19.0_use_easybuild_opts_intel.patch
'150b293250f1ca476a1d268534a236e06dbf5960d25c2a09f6d3f5e82c043316', # DIRAC-19.0_use_easybuild_opts.patch
'527680cab911a8c7a52347d7ace516a497b725043537a6274670a1aaa97bfb0f', # DIRAC-19.0_fix_test_path.patch
]

builddependencies = [('CMake', '3.16.4')]

dependencies = [('Python', '2.7.18')]

separate_build_dir = True

configopts = '-DCMAKE_BUILD_TYPE=RELEASE '
configopts += '-DENABLE_BLAS=off '
configopts = '-DENABLE_BLAS=off '
configopts += '-DENABLE_LAPACK=off '
configopts += '-DMKL_FLAG=off '
configopts += '-DBLAS_LANG=Fortran '
Expand All @@ -47,7 +44,6 @@ configopts += '-DENABLE_RUNTIMECHECK=False '
configopts += '-DENABLE_64BIT_INTEGERS=True '
configopts += '-DEXPLICIT_LIBS="${LIBLAPACK_MT}" '
configopts += '-DENABLE_PCMSOLVER=OFF '
configopts += '-G"Unix Makefiles" '

parallel = 1

Expand Down
10 changes: 3 additions & 7 deletions easybuild/easyconfigs/d/DIRAC/DIRAC-19.0-intel-2020a-Python-2.7.18-mpi-int64.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ sources = ['DIRAC-%(version)s-Source.tar.gz']
patches = [
'%(name)s-%(version)s_remove-broken-tests-intel.patch',
'%(name)s-%(version)s_fix-bss_energy_test.patch',
'%(name)s-%(version)s_use_easybuild_opts_intel.patch',
'%(name)s-%(version)s_use_easybuild_opts.patch',
'%(name)s-%(version)s_fix_test_path.patch',
'%(name)s-%(version)s_fix_mpi_tests.patch',
]
checksums = [
'f0e3610bdd1fbcff90cdfb4cf3fd7582a4762f533af7d635c4bc4d114f402c32', # DIRAC-19.0-Source.tar.gz
'cb0e07097499fe59180d79a5db9ee883b9c83e16dcc6210fd945072c3a54c8a4', # DIRAC-19.0_remove-broken-tests-intel.patch
'e66be847d87ccfda23687de31a3a7c8d71c97b0accd290cf7ade4b4184f1fb93', # DIRAC-19.0_fix-bss_energy_test.patch
'666a9053d6c1287ee7aa471d18436133931959b3eacb7619d5197dbfb4e0c1fe', # DIRAC-19.0_use_easybuild_opts_intel.patch
'150b293250f1ca476a1d268534a236e06dbf5960d25c2a09f6d3f5e82c043316', # DIRAC-19.0_use_easybuild_opts.patch
'527680cab911a8c7a52347d7ace516a497b725043537a6274670a1aaa97bfb0f', # DIRAC-19.0_fix_test_path.patch
'ccc26fc320f0967211b6390244b1fa359ba5d0294071d5d2cb9e36b4652a52b2', # DIRAC-19.0_fix_mpi_tests.patch
]
Expand All @@ -32,10 +32,7 @@ builddependencies = [('CMake', '3.16.4')]

dependencies = [('Python', '2.7.18')]

separate_build_dir = True

configopts = '-DCMAKE_BUILD_TYPE=RELEASE '
configopts += '-DENABLE_BLAS=off '
configopts = '-DENABLE_BLAS=off '
configopts += '-DENABLE_LAPACK=off '
configopts += '-DMKL_FLAG=off '
configopts += '-DBLAS_LANG=Fortran '
Expand All @@ -49,7 +46,6 @@ configopts += '-DENABLE_RUNTIMECHECK=False '
configopts += '-DENABLE_64BIT_INTEGERS=True '
configopts += '-DEXPLICIT_LIBS="${LIBSCALAPACK_MT}" '
configopts += '-DENABLE_PCMSOLVER=OFF '
configopts += '-G"Unix Makefiles" '

parallel = 1

Expand Down
70 changes: 70 additions & 0 deletions easybuild/easyconfigs/d/DIRAC/DIRAC-19.0_use_easybuild_opts.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
# Take EasyBuild compiler flags for C, C++, and Fortran
# OCT 5th, 2020 by B. Hajgato (UGent)
# Updated by Alexander Grund (TU Dresden)
diff -ur DIRAC-19.0-Source.orig/cmake/custom/compiler_flags/GNU.C.cmake DIRAC-19.0-Source/cmake/custom/compiler_flags/GNU.C.cmake
--- DIRAC-19.0-Source.orig/cmake/custom/compiler_flags/GNU.C.cmake 2021-08-04 17:42:21.340186361 +0200
+++ DIRAC-19.0-Source/cmake/custom/compiler_flags/GNU.C.cmake 2021-08-04 17:53:53.657008099 +0200
@@ -3,7 +3,5 @@
message(STATUS "Added gcc -maix64 flag due to IBM AIX XL Fortran and integer*8")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maix64 ")
endif()
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g")
- set(CMAKE_C_FLAGS_RELEASE "-O2 -Wno-unused")
- set(CMAKE_C_FLAGS_DEBUG "-O0")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused")
endif()
diff -ur DIRAC-19.0-Source.orig/cmake/custom/compiler_flags/GNU.CXX.cmake DIRAC-19.0-Source/cmake/custom/compiler_flags/GNU.CXX.cmake
--- DIRAC-19.0-Source.orig/cmake/custom/compiler_flags/GNU.CXX.cmake 2021-08-04 17:42:21.340186361 +0200
+++ DIRAC-19.0-Source/cmake/custom/compiler_flags/GNU.CXX.cmake 2021-08-04 17:53:53.657008099 +0200
@@ -1,5 +1,4 @@
if(CMAKE_CXX_COMPILER_ID MATCHES GNU)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -Wno-unknown-pragmas -Wno-sign-compare -Woverloaded-virtual -Wwrite-strings -Wno-unused")
- set(CMAKE_CXX_FLAGS_RELEASE "-Ofast -march=native -DNDEBUG -Wno-unused")
- set(CMAKE_CXX_FLAGS_DEBUG "-O0 -DDEBUG")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unknown-pragmas -Wno-sign-compare -Woverloaded-virtual -Wwrite-strings -Wno-unused")
+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
endif()
diff -ur DIRAC-19.0-Source.orig/cmake/custom/compiler_flags/GNU.Fortran.cmake DIRAC-19.0-Source/cmake/custom/compiler_flags/GNU.Fortran.cmake
--- DIRAC-19.0-Source.orig/cmake/custom/compiler_flags/GNU.Fortran.cmake 2021-08-04 17:42:21.340186361 +0200
+++ DIRAC-19.0-Source/cmake/custom/compiler_flags/GNU.Fortran.cmake 2021-08-04 17:53:53.657008099 +0200
@@ -4,7 +4,6 @@
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -maix64")
message(STATUS "Added gfortran -maix64 flag due to IBM AIX and integer*8")
endif()
- set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -funroll-all-loops -w")
- set(CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS} -O0 -fbounds-check -finit-real=nan -finit-integer=-9999 -Wall")
- #set(CMAKE_Fortran_FLAGS_DEBUG "-O0")
+ set(CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE} -funroll-all-loops -w")
+ set(CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS} -fbounds-check -finit-real=nan -finit-integer=-9999 -Wall")
endif()
diff -ur DIRAC-19.0-Source.orig/cmake/custom/compiler_flags/Intel.C.cmake DIRAC-19.0-Source/cmake/custom/compiler_flags/Intel.C.cmake
--- DIRAC-19.0-Source.orig/cmake/custom/compiler_flags/Intel.C.cmake 2021-08-04 17:42:21.340186361 +0200
+++ DIRAC-19.0-Source/cmake/custom/compiler_flags/Intel.C.cmake 2021-08-04 17:53:53.657008099 +0200
@@ -1,5 +1,3 @@
if(CMAKE_C_COMPILER_ID MATCHES Intel)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -wd981 -wd279 -wd383 -wd1572 -wd177")
- set(CMAKE_C_FLAGS_RELEASE "-O2")
- set(CMAKE_C_FLAGS_DEBUG "-O0")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -wd981 -wd279 -wd383 -wd1572 -wd177")
endif()
diff -ur DIRAC-19.0-Source.orig/cmake/custom/compiler_flags/Intel.CXX.cmake DIRAC-19.0-Source/cmake/custom/compiler_flags/Intel.CXX.cmake
--- DIRAC-19.0-Source.orig/cmake/custom/compiler_flags/Intel.CXX.cmake 2021-08-04 17:42:21.340186361 +0200
+++ DIRAC-19.0-Source/cmake/custom/compiler_flags/Intel.CXX.cmake 2021-08-04 17:53:53.657008099 +0200
@@ -1,5 +1,4 @@
if(CMAKE_CXX_COMPILER_ID MATCHES Intel)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-pragmas")
- set(CMAKE_CXX_FLAGS_RELEASE "-debug -O3 -DNDEBUG")
- set(CMAKE_CXX_FLAGS_DEBUG "-O0 -debug -DDEBUG")
+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
endif()
diff -ur DIRAC-19.0-Source.orig/cmake/custom/compiler_flags/Intel.Fortran.cmake DIRAC-19.0-Source/cmake/custom/compiler_flags/Intel.Fortran.cmake
--- DIRAC-19.0-Source.orig/cmake/custom/compiler_flags/Intel.Fortran.cmake 2021-08-04 17:42:21.340186361 +0200
+++ DIRAC-19.0-Source/cmake/custom/compiler_flags/Intel.Fortran.cmake 2021-08-04 17:53:53.657008099 +0200
@@ -1,5 +1,4 @@
if(CMAKE_Fortran_COMPILER_ID MATCHES Intel)
- set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -w -assume byterecl -g -traceback -DVAR_IFORT")
- set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -ip")
- set(CMAKE_Fortran_FLAGS_DEBUG "-O0")
+ set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -w -assume byterecl -DVAR_IFORT")
+ set(CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE} -ip")
endif()
33 changes: 0 additions & 33 deletions easybuild/easyconfigs/d/DIRAC/DIRAC-19.0_use_easybuild_opts_intel.patch
View file
Open in desktop

This file was deleted.