Patch for add correct path to new ifort omp library

loganoz · Jul 9, 2024 · 5cb0348 · 5cb0348
1 parent 8473800
commit 5cb0348
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 14 deletions.
diff --git a/.github/workflows/CI_parallel.yml b/.github/workflows/CI_parallel.yml
@@ -33,6 +33,7 @@ jobs:
 
     env:
       METIS_HOME:  /home/runner/work/horses3d/horses3d/metis-5.1.0/build/Linux-x86_64
+      INTEL_COMPILER_DIR : /opt/intel/oneapi/compiler/2024.1
     # Steps represent a sequence of tasks that will be executed as part of the job
 
     steps:

diff --git a/.github/workflows/CI_sequential 1.yml b/.github/workflows/CI_sequential 1.yml
@@ -37,6 +37,9 @@ jobs:
           mkl: 'YES'          
         - compiler: ifort
           mkl: 'NO'          
+    env:
+      INTEL_COMPILER_DIR : /opt/intel/oneapi/compiler/2024.1
+
     # Steps represent a sequence of tasks that will be executed as part of the job
 
     steps:

diff --git a/.github/workflows/CI_sequential 2.yml b/.github/workflows/CI_sequential 2.yml
@@ -42,6 +42,8 @@ jobs:
           mkl: 'NO'       
         - compiler: ifort
           hdf5: 'YES'              
+    env:
+      INTEL_COMPILER_DIR : /opt/intel/oneapi/compiler/2024.1
     # Steps represent a sequence of tasks that will be executed as part of the job
 
     steps:

diff --git a/.github/workflows/CI_sequential 3.yml b/.github/workflows/CI_sequential 3.yml
@@ -37,6 +37,8 @@ jobs:
           mkl: 'YES'          
         - compiler: ifort
           mkl: 'NO'          
+    env:
+      INTEL_COMPILER_DIR : /opt/intel/oneapi/compiler/2024.1
     # Steps represent a sequence of tasks that will be executed as part of the job
 
     steps:

diff --git a/.github/workflows/CI_sequential 4.yml b/.github/workflows/CI_sequential 4.yml
@@ -37,6 +37,8 @@ jobs:
           mkl: 'YES'          
         - compiler: ifort
           mkl: 'NO'          
+    env:
+      INTEL_COMPILER_DIR : /opt/intel/oneapi/compiler/2024.1
     # Steps represent a sequence of tasks that will be executed as part of the job
 
     steps:

diff --git a/Solver/Makefile.in b/Solver/Makefile.in
@@ -88,12 +88,18 @@ endif
 ifeq ($(COMPILER),ifort)
   FC:=ifort
   MOD_FLAG:=-module 
+  ## patch, normally is in /opt/intel/oneapi/compiler/2024.1/opt/compiler/include/intel64/
+  INCLUDEO=-I$(INTEL_COMPILER_DIR)/opt/compiler/include/intel64/
 else ifeq ($(COMPILER),intel)
   FC:=ifort
   MOD_FLAG:=-module 
+  ## patch, normally is in /opt/intel/oneapi/compiler/2024.1/opt/compiler/include/intel64/
+  INCLUDEO=-I$(INTEL_COMPILER_DIR)/opt/compiler/include/intel64/
 else ifeq ($(COMPILER),INTEL)
   FC:=ifort
   MOD_FLAG:=-module 
+  ## patch, normally is in /opt/intel/oneapi/compiler/2024.1/opt/compiler/include/intel64/
+  INCLUDEO=-I$(INTEL_COMPILER_DIR)/opt/compiler/include/intel64/
 endif
 
 ##########################################
@@ -226,6 +232,7 @@ ADDONSFLAGS += $(MACROS)
 LIBFLAGS=  FC='$(FC)' \
 	   FFLAGS='$(FFLAGS)' \
 	   INCLUDE='$(INCLUDE)' \
+	   INCLUDEO='$(INCLUDEO)' \
            INSTALL_DIR='$(INSTALL_DIR)' \
 	   AR='$(AR)' \
 	   ARFLAGS='$(ARFLAGS)' \
@@ -238,6 +245,7 @@ LIBFLAGS=  FC='$(FC)' \
 HORSES_NS_FLAGS= FC='$(FC)' \
  	         FFLAGS='$(FFLAGS)'\
                  INCLUDE='$(INCLUDE)' \
+				 INCLUDEO='$(INCLUDEO)' \
                  INSTALL_DIR='$(INSTALL_DIR)' \
 	         MOD_FLAG='$(MOD_FLAG)'\
 	         HORSES_LIBS_EXEC='$(HORSES_LIBS_NS) $(PROBLEM_LIB_NS)' \
@@ -248,6 +256,7 @@ HORSES_NS_FLAGS= FC='$(FC)' \
 HORSES_NSSA_FLAGS= FC='$(FC)' \
  	         FFLAGS='$(FFLAGS)'\
                  INCLUDE='$(INCLUDE)' \
+				 INCLUDEO='$(INCLUDEO)' \
                  INSTALL_DIR='$(INSTALL_DIR)' \
 	         MOD_FLAG='$(MOD_FLAG)'\
 	         HORSES_LIBS_EXEC='$(HORSES_LIBS_NSSA) $(PROBLEM_LIB_NSSA)' \
@@ -259,6 +268,7 @@ HORSES_NSSA_FLAGS= FC='$(FC)' \
 HORSES_iNS_FLAGS= FC='$(FC)' \
  	         FFLAGS='$(FFLAGS)'\
                  INCLUDE='$(INCLUDE)' \
+				 INCLUDEO='$(INCLUDEO)' \
                  INSTALL_DIR='$(INSTALL_DIR)' \
 	         MOD_FLAG='$(MOD_FLAG)'\
 	         HORSES_LIBS_EXEC='$(HORSES_LIBS_iNS) $(PROBLEM_LIB_iNS)' \
@@ -269,6 +279,7 @@ HORSES_iNS_FLAGS= FC='$(FC)' \
 HORSES_CH_FLAGS= FC='$(FC)' \
  	         FFLAGS='$(FFLAGS)'\
                  INCLUDE='$(INCLUDE)' \
+				 INCLUDEO='$(INCLUDEO)' \
                  INSTALL_DIR='$(INSTALL_DIR)' \
 	         MOD_FLAG='$(MOD_FLAG)'\
 	         HORSES_LIBS_EXEC='$(HORSES_LIBS_CH) $(PROBLEM_LIB_CH)' \
@@ -279,6 +290,7 @@ HORSES_CH_FLAGS= FC='$(FC)' \
 HORSES_MU_FLAGS= FC='$(FC)' \
  	         FFLAGS='$(FFLAGS)'\
                  INCLUDE='$(INCLUDE)' \
+				 INCLUDEO='$(INCLUDEO)' \
                  INSTALL_DIR='$(INSTALL_DIR)' \
 	         MOD_FLAG='$(MOD_FLAG)'\
 	         HORSES_LIBS_EXEC='$(HORSES_LIBS_MU) $(PROBLEM_LIB_MU)' \
@@ -289,6 +301,7 @@ HORSES_MU_FLAGS= FC='$(FC)' \
 ADDONSFLAGS= FC='$(FC)' \
  	     FFLAGS='$(FFLAGS)'\
              INCLUDE='$(INCLUDE)' \
+			 INCLUDEO='$(INCLUDEO)' \
              INSTALL_DIR='$(INSTALL_DIR)' \
 	     MOD_FLAG='$(MOD_FLAG)'\
 	     HORSES_LIBS_EXEC='$(HORSES_LIBS_NS) $(PROBLEM_LIB_NS)' \
@@ -481,4 +494,4 @@ header: FORCE
 	@echo
 
 ## Dummy target to make sure a rule is executed
-FORCE:
+FORCE:
diff --git a/Solver/src/libs/mesh/Makefile b/Solver/src/libs/mesh/Makefile
@@ -171,27 +171,27 @@ all: lib$(LIB)_ns.a lib$(LIB)_nssa.a lib$(LIB)_ins.a lib$(LIB)_ch.a lib$(LIB)_mu
 ./build_ns/%.o: %.f90
 	@echo
 	@echo $<
-	$(FC) $(FFLAGS) -DNAVIERSTOKES -I./include_ns $(MACROS) $(EXTLIB_INC) $(INCLUDE) $(INCLUDE)_ns -c $< -o $@ $(MOD_FLAG) ./include_ns
+	$(FC) $(FFLAGS) -DNAVIERSTOKES -I./include_ns $(MACROS) $(EXTLIB_INC) $(INCLUDE) $(INCLUDEO) $(INCLUDE)_ns -c $< -o $@ $(MOD_FLAG) ./include_ns
 
 ./build_nssa/%.o: %.f90
 	@echo
 	@echo $<
-	$(FC) $(FFLAGS) -DNAVIERSTOKES -DSPALARTALMARAS -I./include_nssa $(MACROS) $(EXTLIB_INC) $(INCLUDE) $(INCLUDE)_nssa -c $< -o $@ $(MOD_FLAG) ./include_nssa
+	$(FC) $(FFLAGS) -DNAVIERSTOKES -DSPALARTALMARAS -I./include_nssa $(MACROS) $(EXTLIB_INC) $(INCLUDE) $(INCLUDEO) $(INCLUDE)_nssa -c $< -o $@ $(MOD_FLAG) ./include_nssa
 
 ./build_ins/%.o: %.f90
 	@echo
 	@echo $<
-	$(FC) $(FFLAGS) -DINCNS -I./include_ins $(MACROS) $(EXTLIB_INC) $(INCLUDE) $(INCLUDE)_ins -c $< -o $@ $(MOD_FLAG) ./include_ins
+	$(FC) $(FFLAGS) -DINCNS -I./include_ins $(MACROS) $(EXTLIB_INC) $(INCLUDE) $(INCLUDEO) $(INCLUDE)_ins -c $< -o $@ $(MOD_FLAG) ./include_ins
 
 ./build_ch/%.o: %.f90
 	@echo
 	@echo $<
-	$(FC) $(FFLAGS) -DCAHNHILLIARD -I./include_ch $(MACROS) $(EXTLIB_INC) $(INCLUDE) $(INCLUDE)_ch -c $< -o $@ $(MOD_FLAG) ./include_ch
+	$(FC) $(FFLAGS) -DCAHNHILLIARD -I./include_ch $(MACROS) $(EXTLIB_INC) $(INCLUDE) $(INCLUDEO) $(INCLUDE)_ch -c $< -o $@ $(MOD_FLAG) ./include_ch
 
 ./build_mu/%.o: %.f90
 	@echo
 	@echo $<
-	$(FC) $(FFLAGS) -DMULTIPHASE -DCAHNHILLIARD -I./include_mu $(MACROS) $(EXTLIB_INC) $(INCLUDE) $(INCLUDE)_mu -c $< -o $@ $(MOD_FLAG) ./include_mu
+	$(FC) $(FFLAGS) -DMULTIPHASE -DCAHNHILLIARD -I./include_mu $(MACROS) $(EXTLIB_INC) $(INCLUDE) $(INCLUDEO) $(INCLUDE)_mu -c $< -o $@ $(MOD_FLAG) ./include_mu
 
 lib$(LIB)_ns.a: header mkdirs $(LIBOBJS_NS) ./build_ns/METISPartitioning.o
 	@echo
@@ -292,4 +292,4 @@ clean: FORCE
 #############################################
 #	Dummy procedure to force a rule     #
 #############################################
-FORCE:
+FORCE:
diff --git a/Solver/src/libs/ml/Makefile b/Solver/src/libs/ml/Makefile
@@ -21,7 +21,7 @@ LIB = ml
 ./build/%.o: %.f90
 	@echo
 	@echo $<
-	$(FC) $(FFLAGS) $(MACROS) $(EXTLIB_INC) $(INCLUDE) -c $< -o $@ $(MOD_FLAG) ./include
+	$(FC) $(FFLAGS) $(MACROS) $(EXTLIB_INC) $(INCLUDE) $(INCLUDEO) -c $< -o $@ $(MOD_FLAG) ./include
 
 lib$(LIB).a: header mkdirs $(LIBOBJS)
 	@echo

diff --git a/Solver/src/libs/monitors/Makefile b/Solver/src/libs/monitors/Makefile
@@ -80,27 +80,27 @@ all: lib$(LIB)_ns.a lib$(LIB)_nssa.a lib$(LIB)_ins.a lib$(LIB)_ch.a lib$(LIB)_mu
 ./build_ns/%.o: %.f90
 	@echo
 	@echo $<
-	$(FC) $(FFLAGS) -DNAVIERSTOKES -I./include_ns $(MACROS) $(EXTLIB_INC) $(INCLUDE) $(INCLUDE)_ns -c $< -o $@ $(MOD_FLAG) ./include_ns
+	$(FC) $(FFLAGS) -DNAVIERSTOKES -I./include_ns $(MACROS) $(EXTLIB_INC) $(INCLUDE) $(INCLUDEO) $(INCLUDE)_ns -c $< -o $@ $(MOD_FLAG) ./include_ns
 
 ./build_nssa/%.o: %.f90
 	@echo
 	@echo $<
-	$(FC) $(FFLAGS) -DNAVIERSTOKES -DSPALARTALMARAS -I./include_nssa $(MACROS) $(EXTLIB_INC) $(INCLUDE) $(INCLUDE)_nssa -c $< -o $@ $(MOD_FLAG) ./include_nssa
+	$(FC) $(FFLAGS) -DNAVIERSTOKES -DSPALARTALMARAS -I./include_nssa $(MACROS) $(EXTLIB_INC) $(INCLUDE) $(INCLUDEO) $(INCLUDE)_nssa -c $< -o $@ $(MOD_FLAG) ./include_nssa
 
 ./build_ins/%.o: %.f90
 	@echo
 	@echo $<
-	$(FC) $(FFLAGS) -DINCNS -I./include_ins $(MACROS) $(EXTLIB_INC) $(INCLUDE) $(INCLUDE)_ins -c $< -o $@ $(MOD_FLAG) ./include_ins
+	$(FC) $(FFLAGS) -DINCNS -I./include_ins $(MACROS) $(EXTLIB_INC) $(INCLUDE) $(INCLUDEO) $(INCLUDE)_ins -c $< -o $@ $(MOD_FLAG) ./include_ins
 
 ./build_ch/%.o: %.f90
 	@echo
 	@echo $<
-	$(FC) $(FFLAGS) -DCAHNHILLIARD -I./include_ch $(MACROS) $(EXTLIB_INC) $(INCLUDE) $(INCLUDE)_ch -c $< -o $@ $(MOD_FLAG) ./include_ch
+	$(FC) $(FFLAGS) -DCAHNHILLIARD -I./include_ch $(MACROS) $(EXTLIB_INC) $(INCLUDE) $(INCLUDEO) $(INCLUDE)_ch -c $< -o $@ $(MOD_FLAG) ./include_ch
 
 ./build_mu/%.o: %.f90
 	@echo
 	@echo $<
-	$(FC) $(FFLAGS) -DMULTIPHASE -DCAHNHILLIARD -I./include_mu $(MACROS) $(EXTLIB_INC) $(INCLUDE) $(INCLUDE)_mu -c $< -o $@ $(MOD_FLAG) ./include_mu
+	$(FC) $(FFLAGS) -DMULTIPHASE -DCAHNHILLIARD -I./include_mu $(MACROS) $(EXTLIB_INC) $(INCLUDE) $(INCLUDEO) $(INCLUDE)_mu -c $< -o $@ $(MOD_FLAG) ./include_mu
 
 lib$(LIB)_ns.a: header mkdirs $(LIBOBJS_NS) 
 	@echo
@@ -202,4 +202,4 @@ clean: FORCE
 #############################################
 #	Dummy procedure to force a rule     #
 #############################################
-FORCE:
+FORCE:
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,6 +33,7 @@ jobs: @@
         env:
           METIS_HOME:  /home/runner/work/horses3d/horses3d/metis-5.1.0/build/Linux-x86_64
+          INTEL_COMPILER_DIR : /opt/intel/oneapi/compiler/2024.1
         # Steps represent a sequence of tasks that will be executed as part of the job
         steps:
@@ Expand Down @@