From b207656fdcb7c04cff690f1adb42a9fdac1ed3da Mon Sep 17 00:00:00 2001 From: Garrett Barter Date: Mon, 30 Jan 2023 16:25:31 -0700 Subject: [PATCH 01/14] adding macs to the CI --- .github/workflows/CI_WEIS.yml | 2 +- setup.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CI_WEIS.yml b/.github/workflows/CI_WEIS.yml index 575e650de..58b89b60a 100644 --- a/.github/workflows/CI_WEIS.yml +++ b/.github/workflows/CI_WEIS.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: true matrix: - os: ["ubuntu-latest"] #, "macOS-latest"] + os: ["ubuntu-latest", "macOS-latest"] python-version: ["3.9","3.10"] steps: diff --git a/setup.py b/setup.py index 85b7ae4c5..8adbced03 100644 --- a/setup.py +++ b/setup.py @@ -134,6 +134,7 @@ def build_extension(self, ext): if pkg in ['WISDEM', 'pyHAMS']: # This option runs `python setup.py install/develop` on each package os.system(sys.executable+" setup.py develop") + #retval = subprocess.call([sys.executable, "setup.py", "develop"]) else: run_setup('setup.py', script_args=sys.argv[1:], stop_after='run') os.chdir('..') From db0f83bba943d00bef7135b856b4cfdcf15d57b6 Mon Sep 17 00:00:00 2001 From: Garrett Barter Date: Mon, 30 Jan 2023 16:58:13 -0700 Subject: [PATCH 02/14] macs need a fortran package --- .github/workflows/CI_WEIS.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/CI_WEIS.yml b/.github/workflows/CI_WEIS.yml index 58b89b60a..7d0a1f4df 100644 --- a/.github/workflows/CI_WEIS.yml +++ b/.github/workflows/CI_WEIS.yml @@ -60,6 +60,12 @@ jobs: conda install -y petsc4py mpi4py openmpi python -c "import platform; print(platform.node())" + # Install dependencies of WISDEM specific to windows + - name: Add dependencies mac specific + if: contains( matrix.os, 'mac') + run: | + conda install -y gfortran + # Install dependencies of WISDEM specific to windows - name: Add dependencies windows specific if: contains( matrix.os, 'windows') From dacf0007d79c9a6b014d5224637af2f070d74e05 Mon Sep 17 00:00:00 2001 From: Garrett Barter Date: Mon, 30 Jan 2023 17:38:38 -0700 Subject: [PATCH 03/14] trying different compiler approach --- .github/workflows/CI_WEIS.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI_WEIS.yml b/.github/workflows/CI_WEIS.yml index 7d0a1f4df..0e87c1b47 100644 --- a/.github/workflows/CI_WEIS.yml +++ b/.github/workflows/CI_WEIS.yml @@ -64,7 +64,7 @@ jobs: - name: Add dependencies mac specific if: contains( matrix.os, 'mac') run: | - conda install -y gfortran + conda install -y fortran-compiler # Install dependencies of WISDEM specific to windows - name: Add dependencies windows specific From f62ee10fb3de2b44ad93bd90d089ed8d1c369d8c Mon Sep 17 00:00:00 2001 From: Garrett Barter Date: Mon, 30 Jan 2023 20:22:11 -0700 Subject: [PATCH 04/14] trying different compiler approach --- .github/workflows/CI_WEIS.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI_WEIS.yml b/.github/workflows/CI_WEIS.yml index 0e87c1b47..aa32e0bea 100644 --- a/.github/workflows/CI_WEIS.yml +++ b/.github/workflows/CI_WEIS.yml @@ -64,7 +64,7 @@ jobs: - name: Add dependencies mac specific if: contains( matrix.os, 'mac') run: | - conda install -y fortran-compiler + conda install -y gfortran openlibm # Install dependencies of WISDEM specific to windows - name: Add dependencies windows specific From a8628f452876e43439a3d517c2cbce0c33680911 Mon Sep 17 00:00:00 2001 From: Garrett Barter Date: Tue, 31 Jan 2023 05:19:44 -0700 Subject: [PATCH 05/14] trying different compiler approach --- .github/workflows/CI_WEIS.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI_WEIS.yml b/.github/workflows/CI_WEIS.yml index aa32e0bea..c0a579551 100644 --- a/.github/workflows/CI_WEIS.yml +++ b/.github/workflows/CI_WEIS.yml @@ -64,8 +64,14 @@ jobs: - name: Add dependencies mac specific if: contains( matrix.os, 'mac') run: | - conda install -y gfortran openlibm - + # make sure gfortran is available + # https://github.com/actions/virtual-environments/issues/2524 + # https://github.com/cbg-ethz/dce/blob/master/.github/workflows/pkgdown.yaml + sudo ln -s /usr/local/bin/gfortran-11 /usr/local/bin/gfortran + sudo mkdir /usr/local/gfortran + sudo ln -s /usr/local/Cellar/gcc@11/*/lib/gcc/11 /usr/local/gfortran/lib + gfortran --version + # Install dependencies of WISDEM specific to windows - name: Add dependencies windows specific if: contains( matrix.os, 'windows') From 07dbd57049ffbaf986438ca46de98d04b4dd8b47 Mon Sep 17 00:00:00 2001 From: Garrett Barter Date: Tue, 31 Jan 2023 05:55:16 -0700 Subject: [PATCH 06/14] trying different compiler approach --- .github/workflows/CI_WEIS.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI_WEIS.yml b/.github/workflows/CI_WEIS.yml index c0a579551..04be9fb9c 100644 --- a/.github/workflows/CI_WEIS.yml +++ b/.github/workflows/CI_WEIS.yml @@ -67,9 +67,10 @@ jobs: # make sure gfortran is available # https://github.com/actions/virtual-environments/issues/2524 # https://github.com/cbg-ethz/dce/blob/master/.github/workflows/pkgdown.yaml - sudo ln -s /usr/local/bin/gfortran-11 /usr/local/bin/gfortran - sudo mkdir /usr/local/gfortran - sudo ln -s /usr/local/Cellar/gcc@11/*/lib/gcc/11 /usr/local/gfortran/lib + #sudo ln -s /usr/local/bin/gfortran-11 /usr/local/bin/gfortran + #sudo mkdir /usr/local/gfortran + #sudo ln -s /usr/local/Cellar/gcc@11/*/lib/gcc/11 /usr/local/gfortran/lib + conda install -y compilers gfortran --version # Install dependencies of WISDEM specific to windows From dafa8cf9ddab45d68a6c4c625b2ceaa8346dd12d Mon Sep 17 00:00:00 2001 From: Garrett Barter Date: Tue, 31 Jan 2023 06:52:19 -0700 Subject: [PATCH 07/14] trying different compiler approach --- .github/workflows/CI_WEIS.yml | 60 ++++++++++++++++------------------- 1 file changed, 27 insertions(+), 33 deletions(-) diff --git a/.github/workflows/CI_WEIS.yml b/.github/workflows/CI_WEIS.yml index 04be9fb9c..922500e49 100644 --- a/.github/workflows/CI_WEIS.yml +++ b/.github/workflows/CI_WEIS.yml @@ -23,42 +23,32 @@ jobs: - uses: actions/checkout@v3 # This is the more official way to do miniconda, but it messes with the GitHub worker environment and shell quite a bit - #- uses: conda-incubator/setup-miniconda@v2 - # # https://github.com/marketplace/actions/setup-miniconda - # with: - # miniconda-version: "latest" - # channels: conda-forge - # auto-update-conda: true - # python-version: ${{ matrix.python-version }} - # environment-file: environment.yml - # activate-environment: test - # auto-activate-base: false - - # This is a less official, but more lightweight way to do miniconda - - uses: s-weigand/setup-conda@v1 - # https://github.com/marketplace/actions/setup-conda + - uses: conda-incubator/setup-miniconda@v2 + # https://github.com/marketplace/actions/setup-miniconda with: - update-conda: true + miniconda-version: "latest" + channels: conda-forge + auto-update-conda: true python-version: ${{ matrix.python-version }} - conda-channels: conda-forge - activate-conda: true - - run: conda env update --file environment.yml + environment-file: environment.yml + activate-environment: test + auto-activate-base: false + + # This is a less official, but more lightweight way to do miniconda + #- uses: s-weigand/setup-conda@v1 + # # https://github.com/marketplace/actions/setup-conda + # with: + # update-conda: true + # python-version: ${{ matrix.python-version }} + # conda-channels: conda-forge + # activate-conda: true + #- run: conda env update --file environment.yml #- name: Show custom environment # shell: bash # run: | # cat $GITHUB_ENV # printenv - - # Install dependencies of WEIS specific to ubuntu - - name: Add dependencies ubuntu specific - if: false == contains( matrix.os, 'windows') - shell: bash - # (if you use the shell here, cannot use 'compiler' package otherwise get link problems to system libraries - # Mpi only seems to work with the shell command though, so instead rely on system compilers - run: | - conda install -y petsc4py mpi4py openmpi - python -c "import platform; print(platform.node())" # Install dependencies of WISDEM specific to windows - name: Add dependencies mac specific @@ -78,9 +68,17 @@ jobs: if: contains( matrix.os, 'windows') run: | conda install -y m2w64-toolchain libpython + + # Install dependencies of WEIS specific to ubuntu + - name: Add dependencies ubuntu specific + if: false == contains( matrix.os, 'windows') + # (if you use the shell here, cannot use 'compiler' package otherwise get link problems to system libraries + # Mpi only seems to work with the shell command though, so instead rely on system compilers + run: | + conda install -y petsc4py mpi4py openmpi + python -c "import platform; print(platform.node())" - name: Show custom environment - shell: bash run: | conda list @@ -90,19 +88,16 @@ jobs: # Install WEIS - name: Install WEIS - shell: bash run: | python setup.py develop # List the collected tests for debugging purposes - name: List tests - shell: bash run: | pytest weis --collect-only # Run all tests within WEIS, but not computationally expensive examples - name: Run tests within WEIS - shell: bash run: | pytest weis --cov-config=.coverageac --cov=weis @@ -111,7 +106,6 @@ jobs: if: contains( matrix.os, 'ubuntu') # This also works, https://github.com/AndreMiras/coveralls-python-action #uses: AndreMiras/coveralls-python-action@develop - shell: bash env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | From 9437692836153b1b7f49c8346b8923e192df819f Mon Sep 17 00:00:00 2001 From: Garrett Barter Date: Tue, 31 Jan 2023 12:58:42 -0700 Subject: [PATCH 08/14] file cleanup --- .github/workflows/CI_WEIS.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/CI_WEIS.yml b/.github/workflows/CI_WEIS.yml index 922500e49..c78bad9b2 100644 --- a/.github/workflows/CI_WEIS.yml +++ b/.github/workflows/CI_WEIS.yml @@ -17,10 +17,10 @@ jobs: fail-fast: true matrix: os: ["ubuntu-latest", "macOS-latest"] - python-version: ["3.9","3.10"] + python-version: ["3.9","3.10","3.11"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 # This is the more official way to do miniconda, but it messes with the GitHub worker environment and shell quite a bit - uses: conda-incubator/setup-miniconda@v2 @@ -54,12 +54,6 @@ jobs: - name: Add dependencies mac specific if: contains( matrix.os, 'mac') run: | - # make sure gfortran is available - # https://github.com/actions/virtual-environments/issues/2524 - # https://github.com/cbg-ethz/dce/blob/master/.github/workflows/pkgdown.yaml - #sudo ln -s /usr/local/bin/gfortran-11 /usr/local/bin/gfortran - #sudo mkdir /usr/local/gfortran - #sudo ln -s /usr/local/Cellar/gcc@11/*/lib/gcc/11 /usr/local/gfortran/lib conda install -y compilers gfortran --version From 5455de3853a4aa547a822720967537a0c8c7a0d5 Mon Sep 17 00:00:00 2001 From: Garrett Barter Date: Tue, 31 Jan 2023 12:58:47 -0700 Subject: [PATCH 09/14] Squashed 'pyHAMS/' changes from 02c01bed9..ed65dbe00 ed65dbe00 still trying 3a804498f play nicer with mac runners 50f4cbfee right python e6d0ed4bf right python 558924068 right python 3caea3807 right python 85ba3b5c3 right python 8996ee5b6 right python 49407076f right python 680458fbc action versions 727919c86 test on macs too git-subtree-dir: pyHAMS git-subtree-split: ed65dbe00c8826118d779a7657a50e48867e9190 --- .github/workflows/CI_pyHAMS.yml | 36 +++++++++++++++++++++++---------- meson.build | 30 ++++++--------------------- 2 files changed, 31 insertions(+), 35 deletions(-) diff --git a/.github/workflows/CI_pyHAMS.yml b/.github/workflows/CI_pyHAMS.yml index d36a7b2bc..a3f74d907 100644 --- a/.github/workflows/CI_pyHAMS.yml +++ b/.github/workflows/CI_pyHAMS.yml @@ -13,31 +13,38 @@ jobs: shell: bash -l {0} strategy: - fail-fast: False + fail-fast: true matrix: - os: ["ubuntu-latest", "windows-latest"] - python-version: ["3.8", "3.9", "3.10"] + os: ["ubuntu-latest", "macOS-latest", "windows-latest"] + python-version: ["3.8", "3.9", "3.10", "3.11"] steps: - name: Setup GNU Fortran uses: modflowpy/install-gfortran-action@v1 - name: checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 + id: cp with: python-version: ${{ matrix.python-version }} + update-environment: true + #- name: Setup tmate session + # uses: mxschmitt/action-tmate@v3 + - name: Pip Install pyHAMS + env: + MESON_ARGS: -Dpython_target=${{ steps.cp.outputs.python-path }} run: | - pip install -vv -e . + '${{ steps.cp.outputs.python-path }}' -m pip install -vv -e . - name: Test run run: | cd test - python test_cylinder.py + '${{ steps.cp.outputs.python-path }}' test_cylinder.py build_conda: @@ -48,14 +55,14 @@ jobs: shell: bash -l {0} strategy: - fail-fast: False + fail-fast: true matrix: - os: ["ubuntu-latest", "windows-latest"] - python-version: ["3.8", "3.9", "3.10"] + os: ["ubuntu-latest", "macOS-latest", "windows-latest"] + python-version: ["3.8", "3.9", "3.10", "3.11"] steps: - name: checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - uses: conda-incubator/setup-miniconda@v2 # https://github.com/marketplace/actions/setup-miniconda @@ -74,6 +81,13 @@ jobs: run: | conda install -y m2w64-toolchain libpython + # Install dependencies of WISDEM specific to windows + - name: Add dependencies windows specific + if: contains( matrix.os, 'mac') + run: | + conda install -y compilers + gfortran --version + # Install - name: Conda Install pyHAMS run: | diff --git a/meson.build b/meson.build index 3502b9ad3..e049cf0ce 100644 --- a/meson.build +++ b/meson.build @@ -53,32 +53,14 @@ if not omp.found() endif if fc.get_id() == 'gcc' - lapack = dependency('openblas', required: false) - if not lapack.found() - lapack = fc.find_library('openblas', required: false) - endif - if not lapack.found() - lapack = dependency('lapack', required: false) - endif - if not lapack.found() - lapack = fc.find_library('lapack', required: false) - endif - if not lapack.found() - lapack = declare_dependency( - link_args: '-llapack', - ) - endif + lapack = declare_dependency( + link_args: '-llapack', + ) endif if fc.get_id() == 'intel' - lapack = dependency('mkl', required: false) - if not lapack.found() - lapack = fc.find_library('mkl_rt') - endif - if not lapack.found() - lapack = declare_dependency( - link_args: '-lmkl_rt', - ) - endif + lapack = declare_dependency( + link_args: '-lmkl_rt', + ) endif # https://mesonbuild.com/Python-module.html From 16c8a82102ca310e7a4554e26b769f9b9bd022c7 Mon Sep 17 00:00:00 2001 From: Garrett Barter Date: Tue, 31 Jan 2023 13:24:21 -0700 Subject: [PATCH 10/14] fix checkout version --- .github/workflows/CI_WEIS.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI_WEIS.yml b/.github/workflows/CI_WEIS.yml index c78bad9b2..5cf93ac43 100644 --- a/.github/workflows/CI_WEIS.yml +++ b/.github/workflows/CI_WEIS.yml @@ -20,7 +20,7 @@ jobs: python-version: ["3.9","3.10","3.11"] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 # This is the more official way to do miniconda, but it messes with the GitHub worker environment and shell quite a bit - uses: conda-incubator/setup-miniconda@v2 From 12c8c98aaf83113df69bf322238840934d93f970 Mon Sep 17 00:00:00 2001 From: Garrett Barter Date: Tue, 31 Jan 2023 15:05:33 -0700 Subject: [PATCH 11/14] ready to go for macs I think --- .github/workflows/CI_WEIS.yml | 4 +- .github/workflows/run_exhaustive_examples.yml | 67 +++++++++++-------- 2 files changed, 40 insertions(+), 31 deletions(-) diff --git a/.github/workflows/CI_WEIS.yml b/.github/workflows/CI_WEIS.yml index 5cf93ac43..af1db03b0 100644 --- a/.github/workflows/CI_WEIS.yml +++ b/.github/workflows/CI_WEIS.yml @@ -17,10 +17,10 @@ jobs: fail-fast: true matrix: os: ["ubuntu-latest", "macOS-latest"] - python-version: ["3.9","3.10","3.11"] + python-version: ["3.9","3.10"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 # This is the more official way to do miniconda, but it messes with the GitHub worker environment and shell quite a bit - uses: conda-incubator/setup-miniconda@v2 diff --git a/.github/workflows/run_exhaustive_examples.yml b/.github/workflows/run_exhaustive_examples.yml index 1b8fc0da9..530023ffa 100644 --- a/.github/workflows/run_exhaustive_examples.yml +++ b/.github/workflows/run_exhaustive_examples.yml @@ -20,61 +20,70 @@ jobs: python-version: ["3.9","3.10"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 # This is the more official way to do miniconda, but it messes with the GitHub worker environment and shell quite a bit - #- uses: conda-incubator/setup-miniconda@v2 - # # https://github.com/marketplace/actions/setup-miniconda - # with: - # miniconda-version: "latest" - # channels: conda-forge - # auto-update-conda: true - # python-version: ${{ matrix.python-version }} - # environment-file: environment.yml - # activate-environment: test - # auto-activate-base: false - - # This is a less official, but more lightweight way to do miniconda - - uses: s-weigand/setup-conda@v1 - # https://github.com/marketplace/actions/setup-conda + - uses: conda-incubator/setup-miniconda@v2 + # https://github.com/marketplace/actions/setup-miniconda with: - update-conda: true + miniconda-version: "latest" + channels: conda-forge + auto-update-conda: true python-version: ${{ matrix.python-version }} - conda-channels: conda-forge - activate-conda: true - - run: conda env update --file environment.yml + environment-file: environment.yml + activate-environment: test + auto-activate-base: false + + # This is a less official, but more lightweight way to do miniconda + #- uses: s-weigand/setup-conda@v1 + # # https://github.com/marketplace/actions/setup-conda + # with: + # update-conda: true + # python-version: ${{ matrix.python-version }} + # conda-channels: conda-forge + # activate-conda: true + #- run: conda env update --file environment.yml #- name: Show custom environment # shell: bash # run: | # cat $GITHUB_ENV # printenv + + # Install dependencies of WISDEM specific to windows + - name: Add dependencies mac specific + if: contains( matrix.os, 'mac') + run: | + conda install -y compilers + gfortran --version + + # Install dependencies of WISDEM specific to windows + - name: Add dependencies windows specific + if: contains( matrix.os, 'windows') + run: | + conda install -y m2w64-toolchain libpython # Install dependencies of WEIS specific to ubuntu - name: Add dependencies ubuntu specific if: false == contains( matrix.os, 'windows') - shell: bash # (if you use the shell here, cannot use 'compiler' package otherwise get link problems to system libraries # Mpi only seems to work with the shell command though, so instead rely on system compilers run: | conda install -y petsc4py mpi4py openmpi python -c "import platform; print(platform.node())" - # Install dependencies of WISDEM specific to windows - - name: Add dependencies windows specific - if: contains( matrix.os, 'windows') + - name: Show custom environment run: | - conda install -y m2w64-toolchain libpython + conda list + # Debugging session + #- name: Setup tmate session + # uses: mxschmitt/action-tmate@v3 + # Install WEIS - name: Install WEIS - shell: bash run: | python setup.py develop - - # Debugging session - #- name: Setup tmate session - # uses: mxschmitt/action-tmate@v3 # Test walkthrough notebook - name: Test postprocessing notebooks From 9b3033755fd0d2cbf4c4810f17df1d84ae849669 Mon Sep 17 00:00:00 2001 From: Garrett Barter Date: Tue, 31 Jan 2023 15:14:12 -0700 Subject: [PATCH 12/14] fix MKL issues again --- OpenFAST/cmake/FindMKL.cmake | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/OpenFAST/cmake/FindMKL.cmake b/OpenFAST/cmake/FindMKL.cmake index d2dfb9ebb..bad374996 100644 --- a/OpenFAST/cmake/FindMKL.cmake +++ b/OpenFAST/cmake/FindMKL.cmake @@ -54,8 +54,13 @@ find_library(MKL_CORE_LIB PATHS ${MKLSEARCHPATHS} NO_DEFAULT_PATH) -if (MKL_IFACE_LIB AND MKL_SEQ_LIB AND MKL_CORE_LIB) - set(MKL_LIBRARIES ${MKL_IFACE_LIB} ${MKL_SEQ_LIB} ${MKL_CORE_LIB}) +find_library(MKL_RT_LIB + NAMES mkl_rt libmkl_rt mkl_rt_dll + PATHS ${MKLSEARCHPATHS} + NO_DEFAULT_PATH) + +if (MKL_IFACE_LIB AND MKL_SEQ_LIB AND MKL_CORE_LIB AND MKL_RT_LIB) + set(MKL_LIBRARIES ${MKL_RT_LIB} ${MKL_IFACE_LIB} ${MKL_SEQ_LIB} ${MKL_CORE_LIB}) else() set(MKL_LIBRARIES "") set(MKL_INCLUDE_DIRS "") @@ -63,6 +68,6 @@ endif() include(FindPackageHandleStandardArgs) find_package_handle_standard_args(MKL DEFAULT_MSG - MKL_LIBRARIES MKL_IFACE_LIB MKL_SEQ_LIB MKL_CORE_LIB) # MKL_INCLUDE_DIRS) + MKL_LIBRARIES MKL_RT_LIB MKL_IFACE_LIB MKL_SEQ_LIB MKL_CORE_LIB) # MKL_INCLUDE_DIRS) mark_as_advanced( - MKL_INCLUDE_DIRS MKL_LIBRARIES MKL_IFACE_LIB MKL_SEQ_LIB MKL_CORE_LIB) + MKL_INCLUDE_DIRS MKL_LIBRARIES MKL_RT_LIB MKL_IFACE_LIB MKL_SEQ_LIB MKL_CORE_LIB) From 5497d4e3aaad06db6ebe05f4c6f369627a19af7e Mon Sep 17 00:00:00 2001 From: Garrett Barter Date: Tue, 31 Jan 2023 15:27:40 -0700 Subject: [PATCH 13/14] fix checkout v --- .github/workflows/CI_WEIS.yml | 2 +- .github/workflows/run_exhaustive_examples.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI_WEIS.yml b/.github/workflows/CI_WEIS.yml index af1db03b0..33120e6f0 100644 --- a/.github/workflows/CI_WEIS.yml +++ b/.github/workflows/CI_WEIS.yml @@ -20,7 +20,7 @@ jobs: python-version: ["3.9","3.10"] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 # This is the more official way to do miniconda, but it messes with the GitHub worker environment and shell quite a bit - uses: conda-incubator/setup-miniconda@v2 diff --git a/.github/workflows/run_exhaustive_examples.yml b/.github/workflows/run_exhaustive_examples.yml index 530023ffa..92a90bea8 100644 --- a/.github/workflows/run_exhaustive_examples.yml +++ b/.github/workflows/run_exhaustive_examples.yml @@ -20,7 +20,7 @@ jobs: python-version: ["3.9","3.10"] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 # This is the more official way to do miniconda, but it messes with the GitHub worker environment and shell quite a bit - uses: conda-incubator/setup-miniconda@v2 From e380510cc4543a71e8659feb78ea48c88f271517 Mon Sep 17 00:00:00 2001 From: Garrett Barter Date: Tue, 31 Jan 2023 16:01:42 -0700 Subject: [PATCH 14/14] fix shell confusion --- .github/workflows/run_exhaustive_examples.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/run_exhaustive_examples.yml b/.github/workflows/run_exhaustive_examples.yml index 92a90bea8..57a455c57 100644 --- a/.github/workflows/run_exhaustive_examples.yml +++ b/.github/workflows/run_exhaustive_examples.yml @@ -98,14 +98,12 @@ jobs: # Run all examples - name: Run tests within WEIS - shell: bash run: | cd weis/test python run_examples.py # Run scripts within rotor_opt folder with MPI - name: Run parallel examples rotor optimization - shell: bash run: | cd examples/05_IEA-3.4-130-RWT mpirun -np 2 python weis_driver.py @@ -118,7 +116,6 @@ jobs: # Run scripts within design of experiments folder - name: Run examples design of experiments - shell: bash run: | cd examples/09_design_of_experiments mpirun -n 2 --bind-to core python DOE_openfast.py