Merge remote-tracking branch 'origin/develop' into usflowt

dzalkind · Feb 12, 2024 · e6c8a46 · e6c8a46
2 parents 07577fc + 60e49ba
commit e6c8a46
Show file tree

Hide file tree

Showing 734 changed files with 3,144 additions and 1,533 deletions.
diff --git a/.github/workflows/CI_rosco-compile.yml b/.github/workflows/CI_rosco-compile.yml
@@ -3,80 +3,152 @@ name: CI_rosco-compile
 # We run CI on push commits on all branches
 on: [push, pull_request]
 
-# Specify FORTRAN compiler, used to be "gfortran-10"
-env:
-  FORTRAN_COMPILER: gfortran
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  build:
-    name: Build (${{ matrix.os }})
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: true
-      matrix:
-        os: ["ubuntu-latest", "windows-latest" , "macOS-latest"]
-        python-version: ["3.9"]    
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Install conda/mamba
-        uses: conda-incubator/setup-miniconda@v2
-        # https://github.com/marketplace/actions/setup-miniconda
-        with:
-          # To use mamba, uncomment here, comment out the miniforge line
-          mamba-version: "*"
-          # miniforge-version: "latest"
-          auto-update-conda: true
-          python-version: ${{ matrix.python-version }}
-          environment-file: environment.yml
-          activate-environment: test
-          auto-activate-base: false
-          miniforge-variant: Mambaforge
-
-      # Install ROSCO toolbox
-      - name: Install ROSCO toolbox
-        shell: bash -l {0}
-        run: |
-          python setup.py install      
+    build_pip:
+        name: Pip Build (${{ matrix.os }}) - ${{ matrix.python-version }}
+        runs-on: ${{ matrix.os }}
+        defaults:
+            run:
+                shell: bash -l {0}
+
+        strategy:
+            fail-fast: false #true
+            matrix:
+                os: ["ubuntu-latest", "macOS-latest", "windows-latest"]
+                python-version: ["3.9", "3.10", "3.11"]
+
+        steps:
+            - name: Setup GNU Fortran
+            #  if: false == contains( matrix.os, 'windows')
+              uses: awvwgk/setup-fortran@v1 #modflowpy/install-intelfortran-action@v1 #
+
+            - name: checkout repository
+              uses: actions/checkout@v4
+
+            - name: Set up Python ${{ matrix.python-version }}
+              uses: actions/setup-python@v4
+              id: cp
+              with:
+                  python-version: ${{ matrix.python-version }}
+                  update-environment: true
+
+            #- name: Setup tmate session
+            #  if: contains( matrix.os, 'windows')
+            #  uses: mxschmitt/action-tmate@v3
+
+            # Install ZeroMQ- should be done via Conda
+            #- name: Install ZeroMQ
+            #  run: |
+            #      sudo apt-get update
+            #      sudo apt-get install libzmq3-dev
+
+            - name: Pip Install ROSCO
+              run: |
+                  '${{ steps.cp.outputs.python-path }}' -m pip install -e .
           
-      # Re-generate registry
-      - name: Generate Registry
-        shell: bash -l {0}
-        run: python ROSCO/rosco_registry/write_registry.py
+            # Re-generate registry
+            - name: Generate Registry
+              run: |
+                  '${{ steps.cp.outputs.python-path }}' rosco/controller/rosco_registry/write_registry.py 
+
+            - name: Test run
+            # skipping pip test on windows for now until wisdem pypi is ready
+              if: false == contains( matrix.os, 'windows')    
+              run: |
+                  cd Examples
+                  '${{ steps.cp.outputs.python-path }}' 01_turbine_model.py
+
+
+    build_and_test_conda:
+        name: Conda Build (${{ matrix.os }}) - ${{ matrix.python-version }}
+        runs-on: ${{ matrix.os }}
+        defaults:
+            run:
+                shell: bash -el {0}
+
+        strategy:
+            fail-fast: false #true
+            matrix:
+                os: ["ubuntu-latest", "macOS-latest", "windows-latest"]
+                python-version: ["3.9", "3.10", "3.11"]
+
+        steps:
+            - name: checkout repository
+              uses: actions/checkout@v4
+
+            - uses: conda-incubator/setup-miniconda@v2
+              # https://github.com/marketplace/actions/setup-miniconda
+              with:
+                  #mamba-version: "*"
+                  miniforge-version: "latest"
+                  auto-update-conda: true
+                  python-version: ${{ matrix.python-version }}
+                  environment-file: environment.yml
+                  activate-environment: test
+                  auto-activate-base: false
+
+            - name: Add dependencies windows specific
+              if: contains( matrix.os, 'windows')
+              run: |
+                  conda install -y m2w64-toolchain libpython
+                  gfortran --version
+                  
+            - name: Add dependencies mac specific
+              if: contains( matrix.os, 'mac')
+              run: |
+                  conda install -y compilers
+                  gfortran --version
+
+            # Install 
+            - name: Debug
+              run: |
+                  conda list
+                  printenv
+                    
+            - name: Conda Install ROSCO
+              run: |
+                  python -m pip install -e .
+          
+            - name: Install OpenFAST
+              run: |
+                  conda install openfast==3.5.2
+              
+            #- name: Check OpenFAST
+            #  # if: contains( matrix.os, 'windows')
+            #  run: |
+            #      openfast -v
+            #      which openfast
+
+            - name: Generate Registry
+              run: |
+                  python rosco/controller/rosco_registry/write_registry.py 
           
-      - name: Add dependencies windows 
-        if: true == contains( matrix.os, 'windows')
-        run: |
-          conda install -y m2w64-toolchain
-
-      - name: Add dependencies windows 
-        if: true == contains( matrix.os, 'mac')
-        shell: bash -l {0}
-        run: |
-          conda install -y gfortran
-
-      - name: Setup Workspace
-        run: |
-            cmake -E make_directory ${{runner.workspace}}/ROSCO/ROSCO/build
-
-      - name: Configure and Build - unix
-        if: false == contains( matrix.os, 'windows')
-        shell: bash -l {0}
-        working-directory: "${{runner.workspace}}/ROSCO/ROSCO/build"
-        run: |
-          cmake \
-            -DCMAKE_INSTALL_PREFIX:PATH=${{runner.workspace}}/ROSCO/ROSCO/install \
-            -DCMAKE_Fortran_COMPILER:STRING=${{env.FORTRAN_COMPILER}} \
-            ..
-          cmake --build . --target install
-
-      - name: Configure and Build - windows
-        if: true == contains( matrix.os, 'windows')
-        #shell: bash #-l {0}
-        working-directory: "${{runner.workspace}}/ROSCO/ROSCO/build"
-        run: |
-          cmake -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX="${{runner.workspace}}/ROSCO/ROSCO/build" ..
-          cmake --build . --target install
+            - name: Fix example file extensions
+              run: |
+                  python Examples/Test_Cases/update_libdiscon_extension.py
+
+            #- name: Setup tmate session
+            #  uses: mxschmitt/action-tmate@v3
+            #  with:
+            #      detached: true
+            #  if: contains( matrix.os, 'windows')
+
+            - name: Run ROSCO testing
+              run: |
+                  cd rosco/test
+                  python ROSCO_testing.py
+      
+            - name: Run regression testing
+              if: contains( matrix.os, 'ubuntu')
+              run: |
+                  cd rosco/test
+                  pytest .
+                  
+            - name: Test walkthrough notebook
+              if: contains( matrix.os, 'ubuntu')
+              run: |
+                  cd Examples
+                  treon ROSCO_walkthrough.ipynb
+