Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

require ip version 5.1.0 #200

Merged
merged 17 commits into from
Aug 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 1 addition & 33 deletions .github/workflows/Linux_options.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,22 +74,6 @@ jobs:
make
make install

- name: checkout-sp
uses: actions/checkout@v2
with:
repository: NOAA-EMC/NCEPLIBS-sp
path: sp
ref: v2.3.3

- name: build-sp
run: |
cd sp
mkdir build
cd build
cmake -DCMAKE_INSTALL_PREFIX=~/sp -DBUILD_8=ON ..
make -j2
make install

- name: cache-ip
id: cache-ip
uses: actions/cache@v3
Expand All @@ -114,22 +98,6 @@ jobs:
cmake .. -DCMAKE_INSTALL_PREFIX=~/ip -DCMAKE_PREFIX_PATH=~/sp
make -j2
make install

- name: checkout-ip2
uses: actions/checkout@v2
with:
repository: NOAA-EMC/NCEPLIBS-ip2
path: ip2
ref: develop

- name: build-ip2
run: |
cd ip2
mkdir build
cd build
cmake .. -DCMAKE_INSTALL_PREFIX=~/ip2 -DCMAKE_PREFIX_PATH=~
make -j2
make install

- name: checkout
uses: actions/checkout@v2
Expand All @@ -141,6 +109,6 @@ jobs:
cd wgrib2
mkdir b
cd b
cmake ${{ matrix.config.options }} -DCMAKE_PREFIX_PATH="~/sp;~/ip;~/ip2" ..
cmake ${{ matrix.config.options }} -DCMAKE_PREFIX_PATH="~/ip" ..
make VERBOSE=1
ctest --verbose --output-on-failure --rerun-failed
2 changes: 1 addition & 1 deletion .github/workflows/Spack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
strategy:
matrix:
os: ["ubuntu-latest"]
variants: ["ipolates=0", "ipolates=1"]
variants: ["~ipolates", "+ipolates"]

runs-on: ${{ matrix.os }}

Expand Down
50 changes: 1 addition & 49 deletions .github/workflows/developer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,54 +57,6 @@ jobs:
make
make install

- name: checkout-sp
uses: actions/checkout@v4
with:
repository: NOAA-EMC/NCEPLIBS-sp
path: sp
ref: develop

- name: build-sp
run: |
cd sp
mkdir build
cd build
cmake -DCMAKE_INSTALL_PREFIX=~/sp -DBUILD_8=ON ..
make -j2
make install

- name: checkout-ip
uses: actions/checkout@v4
with:
repository: NOAA-EMC/NCEPLIBS-ip
path: ip
ref: v3.3.3

- name: build-ip
run: |
cd ip
mkdir build
cd build
cmake .. -DCMAKE_INSTALL_PREFIX=~/ip -DCMAKE_PREFIX_PATH=~/sp
make -j2
make install

- name: checkout-ip2
uses: actions/checkout@v4
with:
repository: NOAA-EMC/NCEPLIBS-ip2
path: ip2
ref: develop

- name: build-ip2
run: |
cd ip2
mkdir build
cd build
cmake .. -DCMAKE_INSTALL_PREFIX=~/ip2 -DCMAKE_PREFIX_PATH=~
make -j2
make install

- name: checkout-ip
uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -141,7 +93,7 @@ jobs:
export CFLAGS='-Wall -g -fprofile-abs-path -fprofile-arcs -ftest-coverage -O0'
export FCFLAGS='-Wall -g -fprofile-abs-path -fprofile-arcs -ftest-coverage -O0'
export FFLAGS='-Wall -g -fprofile-abs-path -fprofile-arcs -ftest-coverage -O0'
cmake .. -DENABLE_DOCS=ON -DFTP_TEST_FILES=ON -DCMAKE_PREFIX_PATH="~/ip;~/ip2;~/sp;~/jasper" -DTEST_FILE_DIR=/home/runner/data -DUSE_NETCDF4=ON -DUSE_AEC=ON -DUSE_IPOLATES=ON -DUSE_JASPER=ON
cmake .. -DENABLE_DOCS=ON -DFTP_TEST_FILES=ON -DCMAKE_PREFIX_PATH="~/ip;~/jasper" -DTEST_FILE_DIR=/home/runner/data -DUSE_NETCDF4=ON -DUSE_AEC=ON -DUSE_IPOLATES=ON -DUSE_JASPER=ON
make VERBOSE=1
ctest --verbose --output-on-failure --rerun-failed
gcovr --root .. -v --html-details --exclude ../tests --exclude CMakeFiles --print-summary -o test-coverage.html &> /dev/null
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ endif()
# If user wants to use NCEPLIBS-ip, find it and the sp library.
message(STATUS "Checking if the user want to use NCEPLIBS-ip...")
if(USE_IPOLATES)
find_package(ip CONFIG REQUIRED)
find_package(ip 5.1.0 CONFIG REQUIRED)
list(APPEND definitions_list -DIPOLATES_LIB="ipolates_lib_d")
list(APPEND definitions_list -DUSE_IPOLATES)
endif()
Expand Down
10 changes: 4 additions & 6 deletions spack/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@ def url_for_version(self, version):
)
variant(
"ipolates",
default="3",
description="Use to interpolate to new grids (0 = OFF, 1 = ip, 3 = ip2)",
values=("0", "1", "3"),
default=False,
description="Use to interpolate to new grids",
when="@3.3:",
)
variant(
"spectral", default=False, description="Spectral interpolation in -new_grid", when="@:3.1"
Expand Down Expand Up @@ -151,9 +151,7 @@ def url_for_version(self, version):
conflicts("+openmp", when="%apple-clang")

depends_on("wget", type=("build"), when="@:3.1 +netcdf4")
depends_on("ip@:3", when="@3.2 ipolates=1")
depends_on("ip2", when="@3.2 ipolates=3")
depends_on("[email protected]:", when="@develop ipolates=1")
depends_on("[email protected]:", when="@develop +ipolates")
depends_on("[email protected]:", when="@3.2: +aec")
depends_on("netcdf-c", when="@3.2: +netcdf4")
depends_on("jasper@:2", when="@3.2: +jasper")
Expand Down
Loading