From 66b91e3f149e57320e925050be3589365271e501 Mon Sep 17 00:00:00 2001 From: apcraig Date: Wed, 19 Jul 2023 10:30:55 -0600 Subject: [PATCH 01/24] test ghactions --- .github/workflows/test-cice.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test-cice.yml b/.github/workflows/test-cice.yml index 70fdc4c14..775011180 100644 --- a/.github/workflows/test-cice.yml +++ b/.github/workflows/test-cice.yml @@ -60,6 +60,7 @@ jobs: echo "OS: ${{ matrix.os }}" echo "ENVDEF: ${{ matrix.envdef }}" echo "MINICOND: ${{ matrix.minicond }}" + ls -alr /System/Library/Frameworks/Security.framework - name : install miniconda shell: /bin/bash {0} run: | From a8aa05d581d2372354c32a2a29941b8388e2286a Mon Sep 17 00:00:00 2001 From: apcraig Date: Wed, 19 Jul 2023 11:43:33 -0600 Subject: [PATCH 02/24] test ghactions --- .github/workflows/test-cice.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-cice.yml b/.github/workflows/test-cice.yml index 775011180..3585c782d 100644 --- a/.github/workflows/test-cice.yml +++ b/.github/workflows/test-cice.yml @@ -60,7 +60,7 @@ jobs: echo "OS: ${{ matrix.os }}" echo "ENVDEF: ${{ matrix.envdef }}" echo "MINICOND: ${{ matrix.minicond }}" - ls -alr /System/Library/Frameworks/Security.framework + ls -alr /System/Library/Frameworks/Security.framework/Versions/A/Security - name : install miniconda shell: /bin/bash {0} run: | From 5a4594e0c01e0c99df24e68d13fc571b029ab73c Mon Sep 17 00:00:00 2001 From: apcraig Date: Wed, 19 Jul 2023 11:48:49 -0600 Subject: [PATCH 03/24] test ghactions --- .github/workflows/test-cice.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/test-cice.yml b/.github/workflows/test-cice.yml index 3585c782d..0c03a0c4d 100644 --- a/.github/workflows/test-cice.yml +++ b/.github/workflows/test-cice.yml @@ -60,7 +60,15 @@ jobs: echo "OS: ${{ matrix.os }}" echo "ENVDEF: ${{ matrix.envdef }}" echo "MINICOND: ${{ matrix.minicond }}" + echo "tcx1" + ls -alr /System/Library/Frameworks/Security.framework + echo "tcx2" + ls -alr /System/Library/Frameworks/Security.framework/Versions + echo "tcx3" + ls -alr /System/Library/Frameworks/Security.framework/Versions/A + echo "tcx4" ls -alr /System/Library/Frameworks/Security.framework/Versions/A/Security + echo "tcx5" - name : install miniconda shell: /bin/bash {0} run: | From 00b05df07b255a0229e928b47e6c49a5a78c5c46 Mon Sep 17 00:00:00 2001 From: apcraig Date: Wed, 19 Jul 2023 12:01:50 -0600 Subject: [PATCH 04/24] test ghactions --- .github/workflows/test-cice.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/test-cice.yml b/.github/workflows/test-cice.yml index 0c03a0c4d..954880088 100644 --- a/.github/workflows/test-cice.yml +++ b/.github/workflows/test-cice.yml @@ -69,6 +69,13 @@ jobs: echo "tcx4" ls -alr /System/Library/Frameworks/Security.framework/Versions/A/Security echo "tcx5" + env + echo "tcx6" + env | grep -i frameworks + echo "tcx7" + echo "tcx8" + echo "tcx9" + exit -9 - name : install miniconda shell: /bin/bash {0} run: | From 4fc6f1aa42fac5a266771c71e2804b40297f280b Mon Sep 17 00:00:00 2001 From: apcraig Date: Wed, 19 Jul 2023 12:09:11 -0600 Subject: [PATCH 05/24] test ghactions --- .github/workflows/test-cice.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-cice.yml b/.github/workflows/test-cice.yml index 954880088..eb5bce2ec 100644 --- a/.github/workflows/test-cice.yml +++ b/.github/workflows/test-cice.yml @@ -75,7 +75,6 @@ jobs: echo "tcx7" echo "tcx8" echo "tcx9" - exit -9 - name : install miniconda shell: /bin/bash {0} run: | @@ -118,6 +117,11 @@ jobs: mpifort --version mpicc --version make --version + echo "tcx5" + env + echo "tcx6" + env | grep -i frameworks + exit -9 - name: check setup case run: | cd $HOME/cice From b3e238d749dde28b78d9084a178c5b441da4ba71 Mon Sep 17 00:00:00 2001 From: apcraig Date: Wed, 19 Jul 2023 12:42:52 -0600 Subject: [PATCH 06/24] test ghactions --- .github/workflows/test-cice.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test-cice.yml b/.github/workflows/test-cice.yml index eb5bce2ec..8a33af7de 100644 --- a/.github/workflows/test-cice.yml +++ b/.github/workflows/test-cice.yml @@ -121,7 +121,6 @@ jobs: env echo "tcx6" env | grep -i frameworks - exit -9 - name: check setup case run: | cd $HOME/cice From cee0d73ff6fed7b2f663bbe1ef4b977c7b0361d9 Mon Sep 17 00:00:00 2001 From: apcraig Date: Thu, 20 Jul 2023 10:20:50 -0600 Subject: [PATCH 07/24] test ghactions --- .github/workflows/test-cice.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-cice.yml b/.github/workflows/test-cice.yml index 8a33af7de..7472e8346 100644 --- a/.github/workflows/test-cice.yml +++ b/.github/workflows/test-cice.yml @@ -117,10 +117,19 @@ jobs: mpifort --version mpicc --version make --version + echo "tcx1" + mpiifort --showme:compile + echo "tcx2" + mpiifort --showme:link + echo "tcx3" + mpiifort --showme:command + echo "tcx4" + mpiifort --showme:libdirs echo "tcx5" - env + mpiifort --showme:libs echo "tcx6" - env | grep -i frameworks + mpiifort --showme:incdirs + echo "tcx7" - name: check setup case run: | cd $HOME/cice From f30ca50d268039ebc9b1a4dd72c2894ea69b467e Mon Sep 17 00:00:00 2001 From: apcraig Date: Thu, 20 Jul 2023 10:32:36 -0600 Subject: [PATCH 08/24] test ghactions --- .github/workflows/test-cice.yml | 12 ++++++------ configuration/scripts/machines/Macros.conda_macos | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test-cice.yml b/.github/workflows/test-cice.yml index 7472e8346..5f65f35ce 100644 --- a/.github/workflows/test-cice.yml +++ b/.github/workflows/test-cice.yml @@ -118,17 +118,17 @@ jobs: mpicc --version make --version echo "tcx1" - mpiifort --showme:compile + mpifort --showme:compile echo "tcx2" - mpiifort --showme:link + mpifort --showme:link echo "tcx3" - mpiifort --showme:command + mpifort --showme:command echo "tcx4" - mpiifort --showme:libdirs + mpifort --showme:libdirs echo "tcx5" - mpiifort --showme:libs + mpifort --showme:libs echo "tcx6" - mpiifort --showme:incdirs + mpifort --showme:incdirs echo "tcx7" - name: check setup case run: | diff --git a/configuration/scripts/machines/Macros.conda_macos b/configuration/scripts/machines/Macros.conda_macos index 9be1b9ab4..aa7c16a9a 100644 --- a/configuration/scripts/machines/Macros.conda_macos +++ b/configuration/scripts/machines/Macros.conda_macos @@ -35,6 +35,7 @@ endif # Linker LD:= $(FC) +LDFLAGS += --no-warn-search-mismatch # Location of the compiled Fortran modules (NetCDF) MODDIR += -I$(CONDA_PREFIX)/include From f2b31f52bce037637eb43f91fb1e344a323ff295 Mon Sep 17 00:00:00 2001 From: apcraig Date: Thu, 20 Jul 2023 10:52:25 -0600 Subject: [PATCH 09/24] test ghactions --- .github/workflows/test-cice.yml | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/test-cice.yml b/.github/workflows/test-cice.yml index 5f65f35ce..ec904079f 100644 --- a/.github/workflows/test-cice.yml +++ b/.github/workflows/test-cice.yml @@ -117,19 +117,20 @@ jobs: mpifort --version mpicc --version make --version - echo "tcx1" + echo "mpifort -v:" + mpifort -v + echo "mpifort --showme:compile:" mpifort --showme:compile - echo "tcx2" + echo "mpifort --showme:link:" mpifort --showme:link - echo "tcx3" + echo "mpifort --showme:command:" mpifort --showme:command - echo "tcx4" + echo "mpifort --showme:libdirs:" mpifort --showme:libdirs - echo "tcx5" + echo "mpifort --showme:libs:" mpifort --showme:libs - echo "tcx6" + echo "mpifort --showme:incdirs:" mpifort --showme:incdirs - echo "tcx7" - name: check setup case run: | cd $HOME/cice @@ -138,12 +139,12 @@ jobs: run: | cd $HOME/cice ./cice.setup -m conda -e ${{ matrix.envdef }} --test smoke --testid c0 -# - name: compile case -# run: | -# cd $HOME/cice -# ./cice.setup -m conda -e ${{ matrix.envdef }} -c case1 -# cd case1 -# ./cice.build + - name: check cice compile + run: | + cd $HOME/cice + ./cice.setup -m conda -e ${{ matrix.envdef }} -c case1 --pes 2x2 -s diag1 + cd case1 + ./cice.build - name: download input data run: | cd $HOME/cice-dirs/input From cf20b96a830e8d65fae0b5904cdd42488bc7dc21 Mon Sep 17 00:00:00 2001 From: apcraig Date: Thu, 20 Jul 2023 11:57:57 -0600 Subject: [PATCH 10/24] test ghactions --- configuration/scripts/machines/Macros.conda_macos | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configuration/scripts/machines/Macros.conda_macos b/configuration/scripts/machines/Macros.conda_macos index aa7c16a9a..c0f610d67 100644 --- a/configuration/scripts/machines/Macros.conda_macos +++ b/configuration/scripts/machines/Macros.conda_macos @@ -35,7 +35,8 @@ endif # Linker LD:= $(FC) -LDFLAGS += --no-warn-search-mismatch +##LDFLAGS += --no-warn-mismatch +LDFLAGS += --noinhibit-exec # Location of the compiled Fortran modules (NetCDF) MODDIR += -I$(CONDA_PREFIX)/include From 6102035ac98c98901c13056181094384e309eb39 Mon Sep 17 00:00:00 2001 From: apcraig Date: Thu, 20 Jul 2023 14:06:27 -0600 Subject: [PATCH 11/24] test ghactions --- .github/workflows/test-cice.yml | 3 ++- configuration/scripts/machines/Macros.conda_macos | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-cice.yml b/.github/workflows/test-cice.yml index ec904079f..e66fa581b 100644 --- a/.github/workflows/test-cice.yml +++ b/.github/workflows/test-cice.yml @@ -26,7 +26,8 @@ jobs: strategy: matrix: # os: [macos-latest, ubuntu-latest] - os: [macos-latest] +# os: [macos-latest] + os: [macos-11] # os: [ubuntu-latest] include: - os: macos-latest diff --git a/configuration/scripts/machines/Macros.conda_macos b/configuration/scripts/machines/Macros.conda_macos index c0f610d67..79317996e 100644 --- a/configuration/scripts/machines/Macros.conda_macos +++ b/configuration/scripts/machines/Macros.conda_macos @@ -36,7 +36,7 @@ endif # Linker LD:= $(FC) ##LDFLAGS += --no-warn-mismatch -LDFLAGS += --noinhibit-exec +##LDFLAGS += --noinhibit-exec # Location of the compiled Fortran modules (NetCDF) MODDIR += -I$(CONDA_PREFIX)/include From eccb299f5c7716032712dde0752e931ab8df0211 Mon Sep 17 00:00:00 2001 From: apcraig Date: Thu, 20 Jul 2023 14:09:33 -0600 Subject: [PATCH 12/24] test ghactions --- .github/workflows/test-cice.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/test-cice.yml b/.github/workflows/test-cice.yml index e66fa581b..01c9c8669 100644 --- a/.github/workflows/test-cice.yml +++ b/.github/workflows/test-cice.yml @@ -30,6 +30,9 @@ jobs: os: [macos-11] # os: [ubuntu-latest] include: + - os: macos-11 + envdef: macos + minicond: Miniconda3-latest-MacOSX-x86_64.sh - os: macos-latest envdef: macos minicond: Miniconda3-latest-MacOSX-x86_64.sh From f247ae2c1ea62cc0d01951d70a483719567143ca Mon Sep 17 00:00:00 2001 From: apcraig Date: Thu, 20 Jul 2023 14:10:22 -0600 Subject: [PATCH 13/24] test ghactions --- .github/workflows/test-cice.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-cice.yml b/.github/workflows/test-cice.yml index 01c9c8669..d47b2ebd6 100644 --- a/.github/workflows/test-cice.yml +++ b/.github/workflows/test-cice.yml @@ -33,9 +33,9 @@ jobs: - os: macos-11 envdef: macos minicond: Miniconda3-latest-MacOSX-x86_64.sh - - os: macos-latest - envdef: macos - minicond: Miniconda3-latest-MacOSX-x86_64.sh +# - os: macos-latest +# envdef: macos +# minicond: Miniconda3-latest-MacOSX-x86_64.sh # - os: ubuntu-latest # envdef: linux # minicond: Miniconda3-latest-Linux-x86_64.sh From 735ce04b687734fb733264a74fc8e3dffda13d63 Mon Sep 17 00:00:00 2001 From: apcraig Date: Thu, 20 Jul 2023 14:22:09 -0600 Subject: [PATCH 14/24] test ghactions --- .github/workflows/test-cice.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-cice.yml b/.github/workflows/test-cice.yml index d47b2ebd6..ad7cce897 100644 --- a/.github/workflows/test-cice.yml +++ b/.github/workflows/test-cice.yml @@ -27,10 +27,10 @@ jobs: matrix: # os: [macos-latest, ubuntu-latest] # os: [macos-latest] - os: [macos-11] + os: [macos-13] # os: [ubuntu-latest] include: - - os: macos-11 + - os: macos-13 envdef: macos minicond: Miniconda3-latest-MacOSX-x86_64.sh # - os: macos-latest From 6c717d0a5bab2486b7cad332b9a4d11afe726f61 Mon Sep 17 00:00:00 2001 From: apcraig Date: Fri, 21 Jul 2023 15:14:34 -0600 Subject: [PATCH 15/24] test ghactions --- .github/workflows/test-cice.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test-cice.yml b/.github/workflows/test-cice.yml index ad7cce897..397074915 100644 --- a/.github/workflows/test-cice.yml +++ b/.github/workflows/test-cice.yml @@ -26,16 +26,16 @@ jobs: strategy: matrix: # os: [macos-latest, ubuntu-latest] -# os: [macos-latest] - os: [macos-13] + os: [macos-latest] +# os: [macos-13] # os: [ubuntu-latest] include: - - os: macos-13 - envdef: macos - minicond: Miniconda3-latest-MacOSX-x86_64.sh -# - os: macos-latest +# - os: macos-13 # envdef: macos # minicond: Miniconda3-latest-MacOSX-x86_64.sh + - os: macos-latest + envdef: macos + minicond: Miniconda3-latest-MacOSX-x86_64.sh # - os: ubuntu-latest # envdef: linux # minicond: Miniconda3-latest-Linux-x86_64.sh From 6927deb7c8490e39f7d3abff846544edc0fbded4 Mon Sep 17 00:00:00 2001 From: apcraig Date: Mon, 31 Jul 2023 11:26:45 -0600 Subject: [PATCH 16/24] test github actions --- configuration/scripts/machines/Macros.conda_macos | 1 + 1 file changed, 1 insertion(+) diff --git a/configuration/scripts/machines/Macros.conda_macos b/configuration/scripts/machines/Macros.conda_macos index 79317996e..e08b9c073 100644 --- a/configuration/scripts/machines/Macros.conda_macos +++ b/configuration/scripts/machines/Macros.conda_macos @@ -37,6 +37,7 @@ endif LD:= $(FC) ##LDFLAGS += --no-warn-mismatch ##LDFLAGS += --noinhibit-exec +LDFLAGS += -lc++ # Location of the compiled Fortran modules (NetCDF) MODDIR += -I$(CONDA_PREFIX)/include From 6ef04abb90c8aca5e4dc2a3149e335fdc3caec75 Mon Sep 17 00:00:00 2001 From: apcraig Date: Mon, 31 Jul 2023 11:43:29 -0600 Subject: [PATCH 17/24] test github actions --- .github/workflows/test-cice.yml | 1 + configuration/scripts/machines/Macros.conda_macos | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-cice.yml b/.github/workflows/test-cice.yml index 397074915..57b7900c8 100644 --- a/.github/workflows/test-cice.yml +++ b/.github/workflows/test-cice.yml @@ -87,6 +87,7 @@ jobs: - name: clone uses: actions/checkout@v2 with: + lfs: true submodules: 'recursive' - name: link run: | diff --git a/configuration/scripts/machines/Macros.conda_macos b/configuration/scripts/machines/Macros.conda_macos index e08b9c073..79317996e 100644 --- a/configuration/scripts/machines/Macros.conda_macos +++ b/configuration/scripts/machines/Macros.conda_macos @@ -37,7 +37,6 @@ endif LD:= $(FC) ##LDFLAGS += --no-warn-mismatch ##LDFLAGS += --noinhibit-exec -LDFLAGS += -lc++ # Location of the compiled Fortran modules (NetCDF) MODDIR += -I$(CONDA_PREFIX)/include From 4c448bcf72bc04619958bf143c0944d4383704ab Mon Sep 17 00:00:00 2001 From: apcraig Date: Mon, 31 Jul 2023 11:55:51 -0600 Subject: [PATCH 18/24] test github actions --- .github/workflows/test-cice.yml | 1 - configuration/scripts/machines/Macros.conda_macos | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test-cice.yml b/.github/workflows/test-cice.yml index 57b7900c8..397074915 100644 --- a/.github/workflows/test-cice.yml +++ b/.github/workflows/test-cice.yml @@ -87,7 +87,6 @@ jobs: - name: clone uses: actions/checkout@v2 with: - lfs: true submodules: 'recursive' - name: link run: | diff --git a/configuration/scripts/machines/Macros.conda_macos b/configuration/scripts/machines/Macros.conda_macos index 79317996e..94c3f9884 100644 --- a/configuration/scripts/machines/Macros.conda_macos +++ b/configuration/scripts/machines/Macros.conda_macos @@ -6,7 +6,7 @@ CPPDEFS := -DFORTRANUNDERSCORE ${ICE_CPPDEFS} # Flags for the C compiler -CFLAGS := -c -O2 +CFLAGS := -c -O2 -target x86_64-apple-darwin # Flags for the Fortran compiler FREEFLAGS := -ffree-form From 0669ef9fcb6d7ba0ab28bb99edce9b81cc58c3f9 Mon Sep 17 00:00:00 2001 From: apcraig Date: Mon, 31 Jul 2023 12:28:37 -0600 Subject: [PATCH 19/24] test github actions --- configuration/scripts/machines/Macros.conda_macos | 1 + 1 file changed, 1 insertion(+) diff --git a/configuration/scripts/machines/Macros.conda_macos b/configuration/scripts/machines/Macros.conda_macos index 94c3f9884..9be5ead9b 100644 --- a/configuration/scripts/machines/Macros.conda_macos +++ b/configuration/scripts/machines/Macros.conda_macos @@ -37,6 +37,7 @@ endif LD:= $(FC) ##LDFLAGS += --no-warn-mismatch ##LDFLAGS += --noinhibit-exec +LDFLAGS +- -L/usr/local/opt/openssl/lib # Location of the compiled Fortran modules (NetCDF) MODDIR += -I$(CONDA_PREFIX)/include From 8e00820d24ff04078e2fc125d7c7ec63a84a8eef Mon Sep 17 00:00:00 2001 From: apcraig Date: Mon, 31 Jul 2023 12:41:41 -0600 Subject: [PATCH 20/24] test github actions --- configuration/scripts/machines/Macros.conda_macos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration/scripts/machines/Macros.conda_macos b/configuration/scripts/machines/Macros.conda_macos index 9be5ead9b..81978e032 100644 --- a/configuration/scripts/machines/Macros.conda_macos +++ b/configuration/scripts/machines/Macros.conda_macos @@ -37,7 +37,7 @@ endif LD:= $(FC) ##LDFLAGS += --no-warn-mismatch ##LDFLAGS += --noinhibit-exec -LDFLAGS +- -L/usr/local/opt/openssl/lib +LDFLAGS += -L/usr/local/opt/openssl/lib # Location of the compiled Fortran modules (NetCDF) MODDIR += -I$(CONDA_PREFIX)/include From a1e7d1838dd796a80f61e6cb10e78f6edd7e5625 Mon Sep 17 00:00:00 2001 From: apcraig Date: Mon, 7 Aug 2023 11:37:31 -0600 Subject: [PATCH 21/24] test github actions --- .github/workflows/test-cice.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/test-cice.yml b/.github/workflows/test-cice.yml index 397074915..83fd9f5c8 100644 --- a/.github/workflows/test-cice.yml +++ b/.github/workflows/test-cice.yml @@ -143,6 +143,13 @@ jobs: run: | cd $HOME/cice ./cice.setup -m conda -e ${{ matrix.envdef }} --test smoke --testid c0 + - name: run hello world unit test + run: | + cd $HOME/cice + ./cice.setup -m conda -e ${{ matrix.envdef }} --test unittest --pes 2x1 -s helloworld --testid hw01 + cd *helloworld*hw01 + ./cice.build + ./cice.run - name: check cice compile run: | cd $HOME/cice From 8b4c02d83f2c4b6946cb1a6159dea7b21b9b03bf Mon Sep 17 00:00:00 2001 From: apcraig Date: Mon, 7 Aug 2023 12:02:45 -0600 Subject: [PATCH 22/24] test github actions --- configuration/scripts/machines/Macros.conda_macos | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/configuration/scripts/machines/Macros.conda_macos b/configuration/scripts/machines/Macros.conda_macos index 81978e032..f9edc61dd 100644 --- a/configuration/scripts/machines/Macros.conda_macos +++ b/configuration/scripts/machines/Macros.conda_macos @@ -22,8 +22,10 @@ endif # C and Fortran compilers and MPI wrappers SCC := clang SFC := gfortran -MPICC := mpicc -MPIFC := mpifort +#MPICC := mpicc +#MPIFC := mpifort +MPICC := clang +MPIFC := gfortran ifeq ($(ICE_COMMDIR), mpi) FC := $(MPIFC) From 9bc5b61abfa07c933d53b08cd6013a581169e9ba Mon Sep 17 00:00:00 2001 From: apcraig Date: Mon, 7 Aug 2023 12:27:58 -0600 Subject: [PATCH 23/24] test github actions --- configuration/scripts/machines/Macros.conda_macos | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configuration/scripts/machines/Macros.conda_macos b/configuration/scripts/machines/Macros.conda_macos index f9edc61dd..a10e99040 100644 --- a/configuration/scripts/machines/Macros.conda_macos +++ b/configuration/scripts/machines/Macros.conda_macos @@ -39,10 +39,10 @@ endif LD:= $(FC) ##LDFLAGS += --no-warn-mismatch ##LDFLAGS += --noinhibit-exec -LDFLAGS += -L/usr/local/opt/openssl/lib +##LDFLAGS += -L/usr/local/opt/openssl/lib # Location of the compiled Fortran modules (NetCDF) -MODDIR += -I$(CONDA_PREFIX)/include +MODDIR += -I$(CONDA_PREFIX)/include -I$(CONDA_PREFIX)/lib # Location of the system C header files (required on recent macOS to compile makdep) SDKPATH = $(shell xcrun --show-sdk-path) @@ -54,7 +54,7 @@ else endif # Libraries to be passed to the linker -SLIBS := -L$(CONDA_PREFIX)/lib -lnetcdf -lnetcdff -llapack +SLIBS := -L$(CONDA_PREFIX)/lib -lnetcdf -lnetcdff -llapack -lmpi_usempif08 -lmpi_usempi_ignore_tkr -lmpi_mpifh -lmpi # Necessary flag to compile with OpenMP support ifeq ($(ICE_THREADED), true) From 05c47b8382cccb004d424311cfaed3d219c03d25 Mon Sep 17 00:00:00 2001 From: apcraig Date: Mon, 7 Aug 2023 14:13:17 -0600 Subject: [PATCH 24/24] test github actions --- .github/workflows/test-cice.yml | 47 +++++++------------ .../scripts/machines/Macros.conda_macos | 5 +- 2 files changed, 18 insertions(+), 34 deletions(-) diff --git a/.github/workflows/test-cice.yml b/.github/workflows/test-cice.yml index 83fd9f5c8..8c83c7c8f 100644 --- a/.github/workflows/test-cice.yml +++ b/.github/workflows/test-cice.yml @@ -64,21 +64,6 @@ jobs: echo "OS: ${{ matrix.os }}" echo "ENVDEF: ${{ matrix.envdef }}" echo "MINICOND: ${{ matrix.minicond }}" - echo "tcx1" - ls -alr /System/Library/Frameworks/Security.framework - echo "tcx2" - ls -alr /System/Library/Frameworks/Security.framework/Versions - echo "tcx3" - ls -alr /System/Library/Frameworks/Security.framework/Versions/A - echo "tcx4" - ls -alr /System/Library/Frameworks/Security.framework/Versions/A/Security - echo "tcx5" - env - echo "tcx6" - env | grep -i frameworks - echo "tcx7" - echo "tcx8" - echo "tcx9" - name : install miniconda shell: /bin/bash {0} run: | @@ -117,24 +102,26 @@ jobs: conda env create -f configuration/scripts/machines/environment.yml - name: check conda env run: | - conda activate cice && which mpicc && which mpifort && which make + conda activate cice && which clang && which gfortran && which mpicc && which mpifort && which make + clang --version + gfortran --version mpifort --version mpicc --version make --version - echo "mpifort -v:" - mpifort -v - echo "mpifort --showme:compile:" - mpifort --showme:compile - echo "mpifort --showme:link:" - mpifort --showme:link - echo "mpifort --showme:command:" - mpifort --showme:command - echo "mpifort --showme:libdirs:" - mpifort --showme:libdirs - echo "mpifort --showme:libs:" - mpifort --showme:libs - echo "mpifort --showme:incdirs:" - mpifort --showme:incdirs +# echo "mpifort -v:" +# mpifort -v +# echo "mpifort --showme:compile:" +# mpifort --showme:compile +# echo "mpifort --showme:link:" +# mpifort --showme:link +# echo "mpifort --showme:command:" +# mpifort --showme:command +# echo "mpifort --showme:libdirs:" +# mpifort --showme:libdirs +# echo "mpifort --showme:libs:" +# mpifort --showme:libs +# echo "mpifort --showme:incdirs:" +# mpifort --showme:incdirs - name: check setup case run: | cd $HOME/cice diff --git a/configuration/scripts/machines/Macros.conda_macos b/configuration/scripts/machines/Macros.conda_macos index a10e99040..fad87507c 100644 --- a/configuration/scripts/machines/Macros.conda_macos +++ b/configuration/scripts/machines/Macros.conda_macos @@ -6,7 +6,7 @@ CPPDEFS := -DFORTRANUNDERSCORE ${ICE_CPPDEFS} # Flags for the C compiler -CFLAGS := -c -O2 -target x86_64-apple-darwin +CFLAGS := -c -O2 # Flags for the Fortran compiler FREEFLAGS := -ffree-form @@ -37,9 +37,6 @@ endif # Linker LD:= $(FC) -##LDFLAGS += --no-warn-mismatch -##LDFLAGS += --noinhibit-exec -##LDFLAGS += -L/usr/local/opt/openssl/lib # Location of the compiled Fortran modules (NetCDF) MODDIR += -I$(CONDA_PREFIX)/include -I$(CONDA_PREFIX)/lib