Skip to content

Commit

Permalink
tmp: disable tests
Browse files Browse the repository at this point in the history
  • Loading branch information
aaraney committed Jun 11, 2024
1 parent 9cefa34 commit 904c4fb
Show file tree
Hide file tree
Showing 5 changed files with 70 additions and 85 deletions.
60 changes: 30 additions & 30 deletions .github/actions/ngen-build/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -177,34 +177,34 @@ runs:
echo "CPLUS_INCLUDE_PATH=$(brew --prefix)/include" >> $GITHUB_ENV
shell: bash

- name: Cmake Initialization
id: cmake_init
run: |
export BOOST_ROOT="$(pwd)/boost_1_79_0"
export CFLAGS="-fsanitize=address -O1 -g -fno-omit-frame-pointer -Werror"
export CXXFLAGS="-fsanitize=address -O1 -g -fno-omit-frame-pointer -pedantic-errors -Werror -Wpessimizing-move -Wparentheses -Wrange-loop-construct -Wsuggest-override"
. .venv/bin/activate
[ ! -d "$BOOST_ROOT" ] && echo "Error: no Boost root found at $BOOST_ROOT" && exit 1
cmake -B ${{ inputs.build-dir }} \
-DNGEN_WITH_BMI_C:BOOL=${{ inputs.bmi_c }} \
-DNGEN_WITH_PYTHON:BOOL=${{ inputs.use_python }} \
-DNGEN_WITH_UDUNITS:BOOL=${{ inputs.use_udunits }} \
-DNGEN_WITH_BMI_FORTRAN:BOOL=${{ inputs.bmi_fortran }} \
-DNGEN_WITH_ROUTING:BOOL=${{ inputs.use_troute }} \
-DNGEN_WITH_NETCDF:BOOL=${{ inputs.use_netcdf }} \
-DNGEN_WITH_SQLITE:BOOL=${{ inputs.use_sqlite }} \
-DNGEN_WITH_MPI:BOOL=${{ inputs.use_mpi }} -S .
echo "build-dir=$(echo ${{ inputs.build-dir }})" >> $GITHUB_OUTPUT
shell: bash

- name: Build Targets
#cmake >= 3.15 can build multiple targets
run: |
# Build Targets
# Disable leak detection during test enumeration
export ASAN_OPTIONS=detect_leaks=false
# Activate venv so that test discovery run during build works
. .venv/bin/activate
cmake --build ${{ inputs.build-dir }} --target ${{ inputs.targets }} -- -j ${{ inputs.build-cores }}
shell: bash
#- name: Cmake Initialization
# id: cmake_init
# run: |
# export BOOST_ROOT="$(pwd)/boost_1_79_0"
# export CFLAGS="-fsanitize=address -O1 -g -fno-omit-frame-pointer -Werror"
# export CXXFLAGS="-fsanitize=address -O1 -g -fno-omit-frame-pointer -pedantic-errors -Werror -Wpessimizing-move -Wparentheses -Wrange-loop-construct -Wsuggest-override"
# . .venv/bin/activate
# [ ! -d "$BOOST_ROOT" ] && echo "Error: no Boost root found at $BOOST_ROOT" && exit 1
# cmake -B ${{ inputs.build-dir }} \
# -DNGEN_WITH_BMI_C:BOOL=${{ inputs.bmi_c }} \
# -DNGEN_WITH_PYTHON:BOOL=${{ inputs.use_python }} \
# -DNGEN_WITH_UDUNITS:BOOL=${{ inputs.use_udunits }} \
# -DNGEN_WITH_BMI_FORTRAN:BOOL=${{ inputs.bmi_fortran }} \
# -DNGEN_WITH_ROUTING:BOOL=${{ inputs.use_troute }} \
# -DNGEN_WITH_NETCDF:BOOL=${{ inputs.use_netcdf }} \
# -DNGEN_WITH_SQLITE:BOOL=${{ inputs.use_sqlite }} \
# -DNGEN_WITH_MPI:BOOL=${{ inputs.use_mpi }} -S .
# echo "build-dir=$(echo ${{ inputs.build-dir }})" >> $GITHUB_OUTPUT
# shell: bash

#- name: Build Targets
# #cmake >= 3.15 can build multiple targets
# run: |
# # Build Targets
# # Disable leak detection during test enumeration
# export ASAN_OPTIONS=detect_leaks=false
# # Activate venv so that test discovery run during build works
# . .venv/bin/activate
# cmake --build ${{ inputs.build-dir }} --target ${{ inputs.targets }} -- -j ${{ inputs.build-cores }}
# shell: bash

File renamed without changes.
File renamed without changes.
95 changes: 40 additions & 55 deletions .github/workflows/module_integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,40 +17,40 @@ env:

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# Run general unit tests in linux environment
test_surfacebmi_plus_cfe:
# The type of runner that the job will run on
strategy:
matrix:
os: [ubuntu-22.04, macos-12]
fail-fast: false
runs-on: ${{ matrix.os }}
# # Run general unit tests in linux environment
# test_surfacebmi_plus_cfe:
# # The type of runner that the job will run on
# strategy:
# matrix:
# os: [ubuntu-22.04, macos-12]
# fail-fast: false
# runs-on: ${{ matrix.os }}

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v3
# # Steps represent a sequence of tasks that will be executed as part of the job
# steps:
# # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
# - uses: actions/checkout@v3

- name: Build NGen
uses: ./.github/actions/ngen-build
with:
targets: "ngen"
build-cores: ${{ env.LINUX_NUM_PROC_CORES }}
bmi_c: 'ON'
bmi_fortran: 'ON'
timeout-minutes: 15
# - name: Build NGen
# uses: ./.github/actions/ngen-build
# with:
# targets: "ngen"
# build-cores: ${{ env.LINUX_NUM_PROC_CORES }}
# bmi_c: 'ON'
# bmi_fortran: 'ON'
# timeout-minutes: 15

- name: Run surfacebmi plus cfebmi
run: |
inputfile='data/example_bmi_multi_realization_config.json'
./cmake_build/ngen || true
./cmake_build/ngen data/catchment_data.geojson "cat-27" data/nexus_data.geojson "nex-26" $inputfile
# - name: Run surfacebmi plus cfebmi
# run: |
# inputfile='data/example_bmi_multi_realization_config.json'
# ./cmake_build/ngen || true
# ./cmake_build/ngen data/catchment_data.geojson "cat-27" data/nexus_data.geojson "nex-26" $inputfile

- name: Run surfacebmi, cfebmi and petbmi
run: |
inputfile='data/example_bmi_multi_realization_config_w_noah_pet_cfe.json'
./cmake_build/ngen || true
./cmake_build/ngen data/catchment_data.geojson "cat-27" data/nexus_data.geojson "nex-26" $inputfile
# - name: Run surfacebmi, cfebmi and petbmi
# run: |
# inputfile='data/example_bmi_multi_realization_config_w_noah_pet_cfe.json'
# ./cmake_build/ngen || true
# ./cmake_build/ngen data/catchment_data.geojson "cat-27" data/nexus_data.geojson "nex-26" $inputfile

# Run t-route/pybind integration test
test_troute_integration:
Expand All @@ -66,15 +66,15 @@ jobs:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v3

#- name: Build Ngen
# uses: ./.github/actions/ngen-build
# with:
# targets: "test_routing_pybind"
# build-cores: ${{ env.LINUX_NUM_PROC_CORES }}
# #is this required for this test?
# use_python: 'ON'
# use_troute: 'ON'
# timeout-minutes: 15
- name: Build Ngen
uses: ./.github/actions/ngen-build
with:
targets: "test_routing_pybind"
build-cores: ${{ env.LINUX_NUM_PROC_CORES }}
#is this required for this test?
use_python: 'ON'
use_troute: 'ON'
timeout-minutes: 15
# Disabling this cache for the time being for a few reasons
# 1) t-route build/install can be tricky without pre-cythonized sources
# 2) may not want to use a cached version of t-route if we are testing its integration
Expand All @@ -93,16 +93,6 @@ jobs:
repository: NOAA-OWP/t-route
path: t-route

#This step should come after ngen build???
- name: Configure Fortran Compiler
run: |
if [ ${{ runner.os }} == 'macOS' ]
then
sudo ln -s $(which gfortran-11) $(dirname $(which gfortran-11))/gfortran
export FC=gfortran-11
export F90=gfortran-11
fi
- name: Build T-route Dependency
#if: steps.cache-linux-troute-dep.outputs.cache-hit != 'true'
#MacOS pybind has issues with egg links, so install all packages without egg links on that os
Expand All @@ -114,12 +104,7 @@ jobs:
pip install -U setuptools
pip install -r requirements.txt
pip install deprecated 'pyarrow==11.0.0' tables geopandas numpy wheel
if [ ${{ runner.os }} == 'macOS' ]
then
export LIBRARY_PATH=/usr/local/lib/gcc/11/
export LD_LIBRARY_PATH=/usr/local/lib/gcc/11/
fi
sed -i.bak 's/NETCDF}"/NETCDF}\/include"/' compiler.sh
export NETCDFALTERNATIVE=${NETCDF}/include
export FC=gfortran
export F90=gfortran
./compiler.sh
Expand Down
File renamed without changes.

0 comments on commit 904c4fb

Please sign in to comment.