ifort gone in oneapi 2025

nwchemgit · Oct 26, 2024 · d5a7c89 · d5a7c89
1 parent 869c73e
commit d5a7c89
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/.github/workflows/github_actions.yml b/.github/workflows/github_actions.yml
@@ -88,7 +88,7 @@ jobs:
             mpi_impl: intel
             armci_network: MPI-TS
             nwchem_modules: "xtb driver solvation"
-            fc: ifort
+            fc: ifx
             blas: "build_openblas"
             blas_size: 4
             use_openmp: 2
@@ -98,7 +98,7 @@ jobs:
             mpi_impl: intel
             armci_network: MPI-TS
             nwchem_modules: "xtb driver solvation"
-            fc: ifort
+            fc: ifx
             use_openmp: 2
             use_tblite: 1
           - os: ubuntu-20.04
@@ -183,7 +183,7 @@ jobs:
             mpi_impl: intel
             armci_network: MPI-PR
             nwchem_modules: "tinyqmpw python"
-            fc: ifort
+            fc: ifx
             use_openmp: 2
           - os: ubuntu-20.04
             experimental: true
@@ -197,7 +197,7 @@ jobs:
             mpi_impl: intel
             armci_network: SOCKETS
             nwchem_modules: "tce"
-            fc: ifort
+            fc: ifx
             use_openmp: 2
           - os: ubuntu-22.04
             experimental: true 
@@ -211,13 +211,13 @@ jobs:
             mpi_impl: intel
             armci_network: MPI-PR
             nwchem_modules: "tinyqmpw python"
-            fc: ifort
+            fc: ifx
           - os: ubuntu-22.04
             experimental: true 
             mpi_impl: intel
             armci_network: SOCKETS
             nwchem_modules: "tce"
-            fc: ifort
+            fc: ifx
           - os: ubuntu-20.04
             experimental: true 
             mpi_impl: intel
@@ -245,7 +245,7 @@ jobs:
             mpi_impl: intel
             armci_network: MPI-TS
             nwchem_modules: "tinyqmpw"
-            fc: ifort
+            fc: ifx
             cc: icx
             use_libxc: 1
           - os: macos-latest
@@ -286,7 +286,7 @@ jobs:
             mpi_impl: intel
             armci_network: MPI-TS
             nwchem_modules: "nwdft solvation driver"
-            fc: ifort
+            fc: ifx
             cc: icx
             use_simint: 1
           - os: ubuntu-20.04
@@ -342,7 +342,7 @@ jobs:
             mpi_impl: intel
             armci_network: MPI-TS
             nwchem_modules: "qmandpw qmd"
-            fc: ifort
+            fc: ifx
             use_openmp: 2
           - os: ubuntu-20.04
             experimental: true

diff --git a/src/config/makefile.h b/src/config/makefile.h
@@ -2362,14 +2362,14 @@ ifneq ($(TARGET),LINUX)
 		    _GOTAVX2 := $(shell cat /proc/cpuinfo | grep fma | tail -n 1 | awk ' /fma/  {print "Y"}')
 		    _GOTAVX512F := $(shell cat /proc/cpuinfo | grep avx512f | tail -n 1 | awk ' /avx512f/  {print "Y"}')
                 endif
-		_IFCE := $(shell ifort -V  2>&1 |head -1 |awk ' /64/ {print "Y";exit};')
-		_IFCV7 := $(shell ifort -v  2>&1|grep "Version "|head -n 1|awk ' /7./  {print "Y";exit}')
-		_IFCV11 := $(shell ifort -logo  2>&1|grep "Version "|head -n 1|sed 's/.*Version \([0-9][0-9]\).*/\1/' | awk '{if ($$1 >= 11) {print "Y";exit}}')
-		_IFCV12 := $(shell ifort -logo  2>&1|grep "Version "|head -n 1|sed 's/.*Version \([0-9][0-9]\).*/\1/' | awk '{if ($$1 >= 12) {print "Y";exit}}')
-		_IFCV14 := $(shell ifort -logo  2>&1|grep "Version "|head -n 1|sed 's/.*Version \([0-9][0-9]\).*/\1/' | awk '{if ($$1 >= 14) {print "Y";exit}}')
-		_IFCV15ORNEWER := $(shell ifort -logo  2>&1|grep "Version "|head -n 1 | sed 's/.*Version \([0-9][0-9]\).*/\1/' | awk '{if ($$1 >= 15) {print "Y";exit}}')
-	       _IFCV17 := $(shell ifort -logo  2>&1|grep "Version "|head -n 1 | sed 's/.*Version \([0-9][0-9]\).*/\1/' | awk '{if ($$1 >= 17) {print "Y";exit}}')
-	       _IFCV18 := $(shell ifort -logo  2>&1|grep "Version "|head -n 1 | sed 's/.*Version \([0-9][0-9]\).*/\1/' | awk '{if ($$1 >= 18) {print "Y";exit}}')
+		_IFCE := $(shell $(FC) -V  2>&1 |head -1 |awk ' /64/ {print "Y";exit};')
+		_IFCV7 := $(shell $(FC) -v  2>&1|grep "Version "|head -n 1|awk ' /7./  {print "Y";exit}')
+		_IFCV11 := $(shell $(FC) -logo  2>&1|grep "Version "|head -n 1|sed 's/.*Version \([0-9][0-9]\).*/\1/' | awk '{if ($$1 >= 11) {print "Y";exit}}')
+		_IFCV12 := $(shell $(FC) -logo  2>&1|grep "Version "|head -n 1|sed 's/.*Version \([0-9][0-9]\).*/\1/' | awk '{if ($$1 >= 12) {print "Y";exit}}')
+		_IFCV14 := $(shell $(FC) -logo  2>&1|grep "Version "|head -n 1|sed 's/.*Version \([0-9][0-9]\).*/\1/' | awk '{if ($$1 >= 14) {print "Y";exit}}')
+		_IFCV15ORNEWER := $(shell $(FC) -logo  2>&1|grep "Version "|head -n 1 | sed 's/.*Version \([0-9][0-9]\).*/\1/' | awk '{if ($$1 >= 15) {print "Y";exit}}')
+	       _IFCV17 := $(shell $(FC) -logo  2>&1|grep "Version "|head -n 1 | sed 's/.*Version \([0-9][0-9]\).*/\1/' | awk '{if ($$1 >= 17) {print "Y";exit}}')
+	       _IFCV18 := $(shell $(FC) -logo  2>&1|grep "Version "|head -n 1 | sed 's/.*Version \([0-9][0-9]\).*/\1/' | awk '{if ($$1 >= 18) {print "Y";exit}}')
 
 #               Intel EM64T is required
                 ifneq ($(_IFCE),Y)
@@ -2404,7 +2404,7 @@ ifneq ($(TARGET),LINUX)
 #               CPP=fpp -P
 #
                 ifeq ($(_IFCV15ORNEWER), Y)
-		 IFORTVER := $(shell ifort -v 2>&1|cut -d " " -f 3)
+		 IFORTVER := $(shell $(FC) -v 2>&1|cut -d " " -f 3)
 #                ifeq ($(IFORTVER),2021.7.0)
 #                   $(info     )
 #                   $(info     ifort 2021.7.0 not validated)