From 36f62dfd4a53d201fbb28ecaf0a4026c18108012 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Wed, 29 Jan 2025 12:05:05 +0100 Subject: [PATCH 01/12] Add LLVM/flang-new on OSX-x86 --- azure-pipelines.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0bdf4e3167..12b072bb2f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -164,7 +164,19 @@ jobs: - script: | brew update make CC=gcc-12 FC=gfortran-12 - + +- job: OSX_LLVM_flang-new + pool: + vmImage: 'macOS-latest' + variables: + LD_LIBRARY_PATH: /usr/local/opt/llvm/lib + LIBRARY_PATH: /usr/local/opt/llvm/lib + steps: + - script: | + brew update + brew install llvm + make TARGET=NEHALEM CC=/usr/local/opt/llvm/bin/clang FC=/usr/local/opt/llvm/bin/flang-new + - job: OSX_OpenMP_Clang pool: vmImage: 'macOS-latest' From 0a304a86127625b089179fadbabbf189cede7a25 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Wed, 29 Jan 2025 14:08:49 +0100 Subject: [PATCH 02/12] rename job --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 12b072bb2f..23af632daa 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -165,7 +165,7 @@ jobs: brew update make CC=gcc-12 FC=gfortran-12 -- job: OSX_LLVM_flang-new +- job: OSX_LLVM_flangnew pool: vmImage: 'macOS-latest' variables: From f9daac46b2a2170c60dbe94a8b169bf19bfb55a7 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Wed, 29 Jan 2025 15:26:26 +0100 Subject: [PATCH 03/12] install flang-new with llvm on OSX --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 23af632daa..5f6f942e59 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -174,7 +174,7 @@ jobs: steps: - script: | brew update - brew install llvm + brew install llvm flang make TARGET=NEHALEM CC=/usr/local/opt/llvm/bin/clang FC=/usr/local/opt/llvm/bin/flang-new - job: OSX_OpenMP_Clang From 1fbbe7c1c1783ff958760b14c82d07450a0a0dbc Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Wed, 29 Jan 2025 17:49:45 +0100 Subject: [PATCH 04/12] Update azure-pipelines.yml --- azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5f6f942e59..d2d737349b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -175,6 +175,7 @@ jobs: - script: | brew update brew install llvm flang + find / -name flang-new make TARGET=NEHALEM CC=/usr/local/opt/llvm/bin/clang FC=/usr/local/opt/llvm/bin/flang-new - job: OSX_OpenMP_Clang From 5e4b080f5d1899474d88102595e98de2de708c2d Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Wed, 29 Jan 2025 18:21:50 +0100 Subject: [PATCH 05/12] Update azure-pipelines.yml --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d2d737349b..5ebb77dfea 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -176,7 +176,7 @@ jobs: brew update brew install llvm flang find / -name flang-new - make TARGET=NEHALEM CC=/usr/local/opt/llvm/bin/clang FC=/usr/local/opt/llvm/bin/flang-new + make TARGET=NEHALEM CC=/usr/local/opt/llvm/bin/clang FC=/usr/local/Cellar/flang/19.1.7_1/bin/flang-new - job: OSX_OpenMP_Clang pool: From b1c80a6a09a5acdd251b106d231eef210a453262 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Wed, 29 Jan 2025 19:15:13 +0100 Subject: [PATCH 06/12] Update azure-pipelines.yml --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5ebb77dfea..48228e807e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -175,7 +175,7 @@ jobs: - script: | brew update brew install llvm flang - find / -name flang-new + /usr/local/Cellar/flang/19.1.7_1/bin/flang-new -v make TARGET=NEHALEM CC=/usr/local/opt/llvm/bin/clang FC=/usr/local/Cellar/flang/19.1.7_1/bin/flang-new - job: OSX_OpenMP_Clang From c8af1cc27b9c05c3bfe5b2373b5941f6d3c93894 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Wed, 29 Jan 2025 22:02:13 +0100 Subject: [PATCH 07/12] Update azure-pipelines.yml --- azure-pipelines.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 48228e807e..26aad50f2a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -175,7 +175,11 @@ jobs: - script: | brew update brew install llvm flang - /usr/local/Cellar/flang/19.1.7_1/bin/flang-new -v + data=`/usr/local/Cellar/flang/19.1.7_1/bin/flang-new -v 2>&1 > /dev/null ` + v="${data#*version *}" + v="${v%%*.}" + major="${v%%.*}" + echo $major make TARGET=NEHALEM CC=/usr/local/opt/llvm/bin/clang FC=/usr/local/Cellar/flang/19.1.7_1/bin/flang-new - job: OSX_OpenMP_Clang From 2202496ffb014c0c29fd04370abdf45ac74008f7 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Thu, 30 Jan 2025 12:51:11 +0100 Subject: [PATCH 08/12] see if it is checking out the develop branch's f_check at all --- azure-pipelines.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 26aad50f2a..8b06ba61db 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -175,11 +175,7 @@ jobs: - script: | brew update brew install llvm flang - data=`/usr/local/Cellar/flang/19.1.7_1/bin/flang-new -v 2>&1 > /dev/null ` - v="${data#*version *}" - v="${v%%*.}" - major="${v%%.*}" - echo $major + cat f_check make TARGET=NEHALEM CC=/usr/local/opt/llvm/bin/clang FC=/usr/local/Cellar/flang/19.1.7_1/bin/flang-new - job: OSX_OpenMP_Clang From 44c616ea90ea3811c1f1e7ff9b1b2dfcc3cf5960 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Thu, 30 Jan 2025 13:31:11 +0100 Subject: [PATCH 09/12] Update azure-pipelines.yml --- azure-pipelines.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8b06ba61db..9c8e40f576 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -175,7 +175,6 @@ jobs: - script: | brew update brew install llvm flang - cat f_check make TARGET=NEHALEM CC=/usr/local/opt/llvm/bin/clang FC=/usr/local/Cellar/flang/19.1.7_1/bin/flang-new - job: OSX_OpenMP_Clang From 9b74a15c489f475b0b15dc6b5fbfdf42c328f366 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Thu, 30 Jan 2025 13:32:18 +0100 Subject: [PATCH 10/12] Update f_check --- f_check | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/f_check b/f_check index 93c5962dee..30f9e1ef35 100755 --- a/f_check +++ b/f_check @@ -244,7 +244,7 @@ else openmp='-mp' ;; *flang*) - vendor=FLANG + vendor=FLANGNEW bu=_ openmp='-fopenmp' ;; From 5acdc0fc98dbb82496563efccb3bd63bf71614f3 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Thu, 30 Jan 2025 14:25:40 +0100 Subject: [PATCH 11/12] Update azure-pipelines.yml --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9c8e40f576..26f4c2af3d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -175,7 +175,7 @@ jobs: - script: | brew update brew install llvm flang - make TARGET=NEHALEM CC=/usr/local/opt/llvm/bin/clang FC=/usr/local/Cellar/flang/19.1.7_1/bin/flang-new + make TARGET=NEHALEM CC=/usr/local/opt/llvm/bin/clang FC=/usr/local/Cellar/flang/19.1.7_1/bin/flang-new NO_SHARED=1 - job: OSX_OpenMP_Clang pool: From d795a1a1e115fbac2c6b761eefd95f9d63898926 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Thu, 30 Jan 2025 15:52:17 +0100 Subject: [PATCH 12/12] distinguish classic flang from flang-new in name based recognition --- f_check | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/f_check b/f_check index 30f9e1ef35..244f6bcae3 100755 --- a/f_check +++ b/f_check @@ -244,7 +244,14 @@ else openmp='-mp' ;; *flang*) - vendor=FLANGNEW + vendor=FLANG + data=`$compiler -v 2>&1 > /dev/null` + v="${data#*version *}" + v="${v%%*.}" + major="${v%%.*}" + if [ "$major" -ge 17 ]; then + vendor=FLANGNEW + fi bu=_ openmp='-fopenmp' ;;