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.

Sign up for GitHub

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

BUILD_UTILS=ON by default #740

Merged
merged 23 commits into from
Oct 31, 2024
Merged

BUILD_UTILS=ON by default #740

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
dfe2434
build utils on
AlysonStahl-NOAA Aug 12, 2024
65cae44
debug
AlysonStahl-NOAA Aug 12, 2024
8daf276
Update Linux_versions.yml
AlysonStahl-NOAA Aug 12, 2024
4a61bac
Merge branch 'develop' into as_utils
AlysonStahl-NOAA Aug 13, 2024
1492b36
turn off build_utils in memcheck
AlysonStahl-NOAA Aug 14, 2024
b6d68aa
Merge branch 'NOAA-EMC:develop' into as_utils
AlysonStahl-NOAA Aug 23, 2024
650517d
Update Linux_versions.yml
AlysonStahl-NOAA Aug 23, 2024
d1c5618
debugging
AlysonStahl-NOAA Aug 23, 2024
b5da65f
Update Linux_versions.yml
AlysonStahl-NOAA Aug 23, 2024
9e5c958
updating workflows
AlysonStahl-NOAA Aug 23, 2024
e3a6bd8
Update Linux_versions.yml
AlysonStahl-NOAA Aug 23, 2024
fa78ee6
fixed flags to build shared libraries with nceplibs
AlysonStahl-NOAA Aug 30, 2024
487372a
debugging workflow
AlysonStahl-NOAA Aug 30, 2024
400115d
debugging
AlysonStahl-NOAA Aug 30, 2024
e4e9026
debug
AlysonStahl-NOAA Aug 30, 2024
0f36def
turn off utils in linux_shared workflow
AlysonStahl-NOAA Aug 30, 2024
5175538
Merge branch 'develop' into as_utils
edwardhartnett Sep 4, 2024
35e29b2
Update memcheck.yml
AlysonStahl-NOAA Sep 4, 2024
f962907
Merge branch 'as_utils' of https://github.com/AlysonStahl-NOAA/NCEPLI…
AlysonStahl-NOAA Sep 4, 2024
fd1ba63
some changes overwritten by last merge
AlysonStahl-NOAA Sep 4, 2024
f39bda0
Merge branch 'develop' into as_utils
AlysonStahl-NOAA Sep 24, 2024
23b5974
Merge branch 'develop' into as_utils
AlysonStahl-NOAA Oct 4, 2024
7688e79
Merge branch 'develop' into as_utils
AlysonStahl-NOAA Oct 7, 2024
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
3 changes: 0 additions & 3 deletions .github/workflows/Linux_options.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@ jobs:
- {
options: "-DBUILD_WITH_W3EMC=OFF"
}
- {
options: "-DBUILD_UTILS=ON -DBUILD_WITH_W3EMC=OFF"
}

steps:

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/Linux_shared.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ jobs:
bacio-version: v${{ matrix.bacio-version }}
bacio-cmake-args: -DBUILD_SHARED_LIBS=ON
g2c-version: develop
g2c-cmake-args: -DENABLE_SHARED=ON
g2c-cmake-args: -DBUILD_SHARED_LIBS=ON
jasper-version: version-4.0.0
jasper-cmake-args: -DENABLE_SHARED=ON
w3emc-version: v${{ matrix.w3emc-version }}
w3emc-cmake-args: -DBUILD_WITH_BUFR=OFF -DENABLE_SHARED=ON -DBUILD_WITH_EXTRA_DEPS=OFF
w3emc-cmake-args: -DBUILD_WITH_BUFR=OFF -DBUILD_SHARED_LIBS=ON -DBUILD_WITH_EXTRA_DEPS=OFF
ip-version: develop

- name: checkout
Expand All @@ -78,7 +78,7 @@ jobs:
cd g2
mkdir build
cd build
cmake ${{ matrix.config.options }} -DCMAKE_PREFIX_PATH="$GITHUB_WORKSPACE/nceplibs/jasper;$GITHUB_WORKSPACE/nceplibs/NCEPLIBS-g2c;$GITHUB_WORKSPACE/nceplibs/NCEPLIBS-bacio;$GITHUB_WORKSPACE/nceplibs/NCEPLIBS-w3emc;$GITHUB_WORKSPACE/nceplibs/NCEPLIBS-bacio;$GITHUB_WORKSPACE/nceplibs/NCEPLIBS-ip" -DCMAKE_INSTALL_PREFIX="~/g2/install" -DFTP_TEST_FILES=ON -DTEST_FILE_DIR=/home/runner/data -DBUILD_SHARED_LIBS=ON ..
cmake ${{ matrix.config.options }} -DCMAKE_PREFIX_PATH="$GITHUB_WORKSPACE/nceplibs/jasper;$GITHUB_WORKSPACE/nceplibs/NCEPLIBS-g2c;$GITHUB_WORKSPACE/nceplibs/NCEPLIBS-bacio;$GITHUB_WORKSPACE/nceplibs/NCEPLIBS-w3emc;$GITHUB_WORKSPACE/nceplibs/NCEPLIBS-bacio;$GITHUB_WORKSPACE/nceplibs/NCEPLIBS-ip" -DCMAKE_INSTALL_PREFIX="~/g2/install" -DFTP_TEST_FILES=ON -DTEST_FILE_DIR=/home/runner/data -DBUILD_SHARED_LIBS=ON -DBUILD_UTILS=OFF ..
make -j2 VERBOSE=1

- name: cache-data
Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/Linux_versions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@ jobs:
jasper-version: [2.0.33, 3.0.5, 4.0.0]
bacio-version: [2.4.1, 2.5.0, 2.6.0]
w3emc-version: [2.9.2, 2.9.3, 2.10.0]
build-utils: [ON, OFF]
exclude:
# utils require w3emc version >= 2.10.0
- w3emc-version: 2.9.2
build-utils: ON
- w3emc-version: 2.9.3
build-utils: ON

steps:

Expand Down Expand Up @@ -67,7 +74,7 @@ jobs:
cd g2
mkdir build
cd build
cmake -DCMAKE_PREFIX_PATH="$GITHUB_WORKSPACE/nceplibs/jasper;$GITHUB_WORKSPACE/nceplibs/NCEPLIBS-g2c;$GITHUB_WORKSPACE/nceplibs/NCEPLIBS-bacio;$GITHUB_WORKSPACE/nceplibs/NCEPLIBS-w3emc;$GITHUB_WORKSPACE/nceplibs/NCEPLIBS-ip" -DLOGGING=ON -DFTP_TEST_FILES=ON -DTEST_FILE_DIR=/home/runner/data ..
cmake -DCMAKE_PREFIX_PATH="$GITHUB_WORKSPACE/nceplibs/jasper;$GITHUB_WORKSPACE/nceplibs/NCEPLIBS-g2c;$GITHUB_WORKSPACE/nceplibs/NCEPLIBS-bacio;$GITHUB_WORKSPACE/nceplibs/NCEPLIBS-w3emc;$GITHUB_WORKSPACE/nceplibs/NCEPLIBS-ip" -DLOGGING=ON -DBUILD_UTILS=${{ matrix.build-utils }} -DFTP_TEST_FILES=ON -DTEST_FILE_DIR=/home/runner/data ..
make -j2 VERBOSE=1

- name: cache-data
Expand Down
19 changes: 2 additions & 17 deletions .github/workflows/memcheck.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,22 +38,7 @@ jobs:
w3emc-version: develop
jasper-version: version-4.0.0
w3emc-cmake-args: -DBUILD_WITH_BUFR=OFF

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

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

- name: checkout
uses: actions/checkout@v4
Expand All @@ -72,7 +57,7 @@ jobs:
cd g2
mkdir build
cd build
cmake -DJasper_ROOT=~/Jasper -DCMAKE_PREFIX_PATH="$GITHUB_WORKSPACE/nceplibs/NCEPLIBS-bacio;$GITHUB_WORKSPACE/nceplibs/NCEPLIBS-w3emc;$GITHUB_WORKSPACE/nceplibs/jasper;$GITHUB_WORKSPACE/nceplibs/NCEPLIBS-ip" -DCMAKE_Fortran_FLAGS="-g -O0" -DCMAKE_C_FLAGS="-g -O0" -DFTP_TEST_FILES=ON -DTEST_FILE_DIR=/home/runner/data -DCMAKE_BUILD_TYPE=Debug ..
cmake -DJasper_ROOT=~/Jasper -DCMAKE_PREFIX_PATH="$GITHUB_WORKSPACE/nceplibs/NCEPLIBS-bacio;$GITHUB_WORKSPACE/nceplibs/NCEPLIBS-w3emc;$GITHUB_WORKSPACE/nceplibs/jasper;$GITHUB_WORKSPACE/nceplibs/NCEPLIBS-ip" -DCMAKE_Fortran_FLAGS="-g -O0" -DCMAKE_C_FLAGS="-g -O0" -DFTP_TEST_FILES=ON -DTEST_FILE_DIR=/home/runner/data -DBUILD_UTILS=OFF -DCMAKE_BUILD_TYPE=Debug ..
make -j2 VERBOSE=1

- name: test_memcheck
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ option(LOGGING "Turn on internal logging messages. Only useful to g2 developers.
option(BUILD_4 "Build libg2_4.a" ON)
option(BUILD_D "Build libg2_d.a" ON)
option(BUILD_WITH_W3EMC "Build with NCEPLIBS-w3emc, enabling some GRIB1 functionality" ON)
option(BUILD_UTILS "Build grib utilities" OFF)
option(BUILD_UTILS "Build grib utilities" ON)
option(G2C_COMPARE "Enable copygb2 tests using g2c_compare" OFF)

# Developers can use this option to specify a local directory which
Expand Down
Loading