Skip to content
Open
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
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:

- name: Verify LFS test asset (data.nc)
run: |
bash ./tools/preflight/verify-lfs.sh
bash ./scripts/verify-lfs.sh

- name: Install Dependencies (Build + Test)
run: |
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ endif()
# Test Executable
# ----------------------------------
if(FOREFIRE_BUILD_TOOLS)
add_executable(ANN_test tools/runANN/ANNTest.cpp)
add_executable(ANN_test tests/runANN/ANNTest.cpp)
target_link_libraries(ANN_test PRIVATE forefire_netcdf)
endif()

Expand Down Expand Up @@ -479,7 +479,7 @@ if(FOREFIRE_CHECK_LFS)
message(STATUS "Running Git LFS data integrity check...")

execute_process(
COMMAND bash tools/check_all_lfs.bash
COMMAND bash scripts/check_all_lfs.bash
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
RESULT_VARIABLE LFS_CHECK_RESULT
OUTPUT_VARIABLE LFS_CHECK_OUTPUT
Expand Down
10 changes: 4 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,18 @@ WORKDIR /build
# LICENSE is required by CPack at configure time (CMakeLists includes CPack).
COPY --link CMakeLists.txt LICENSE pyproject.toml ./
COPY --link app/ ./app/
# tools/ is needed at configure time: CMakeLists.txt invokes
# tools/check_all_lfs.bash and references tools/runANN/ANNTest.cpp.
COPY --link tools/ ./tools/
COPY --link src/ ./src/
COPY --link third_party/ ./third_party/

# -march=native is off: this image is published and has to run on CPUs other
# than the builder's. The LFS check and the unit tests are off too: tests/ is
# not copied into this stage, so they could only fail.
# than the builder's. The LFS check, the unit tests and ANN_test are off
# too: tests/ and scripts/ are not copied into this stage, so they could only
# fail.
#
# Only libforefireL.so is carried into the runtime stage, and the wheel build
# below compiles the core again on its own terms, so building the `forefire`
# and ANN_test executables here as well would just be a wasted compile.
RUN cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DFOREFIRE_NATIVE_ARCH=OFF -DFOREFIRE_CHECK_LFS=OFF -DFOREFIRE_BUILD_TESTS=OFF \
RUN cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DFOREFIRE_NATIVE_ARCH=OFF -DFOREFIRE_CHECK_LFS=OFF -DFOREFIRE_BUILD_TESTS=OFF -DFOREFIRE_BUILD_TOOLS=OFF \
&& cmake --build build -j"$(nproc)" --target forefireL

COPY --link bindings/ ./bindings/
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ test-command = [
# x86_64 and aarch64; the C++4 API is built from source by the script below.
manylinux-x86_64-image = "manylinux_2_28"
manylinux-aarch64-image = "manylinux_2_28"
before-all = "bash {project}/tools/devops/install-netcdf-manylinux.sh"
before-all = "bash {project}/scripts/install-netcdf-manylinux.sh"

[tool.cibuildwheel.macos]
before-all = "brew install netcdf netcdf-cxx"
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion tools/preflight/verify-lfs.sh → scripts/verify-lfs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -euo pipefail
# Minimal preflight check for Git LFS assets used by quick-start tests
# Verifies that tests/runff/data.nc is a real NetCDF file (by size) and, if available, via ncdump.

PROJECT_ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")"/../.. && pwd)"
PROJECT_ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")"/.. && pwd)"
DATA_FILE_REL="tests/runff/data.nc"
DATA_FILE="${PROJECT_ROOT_DIR}/${DATA_FILE_REL}"

Expand Down
2 changes: 1 addition & 1 deletion tests/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ model — evaluates it over the fuel, slope and wind combinations in
`modelrun.csv`, and checks the result.

It needs no machine-learning framework. `ANN_test` is a ForeFire tool built
from `tools/runANN/ANNTest.cpp`, and the `.ffann` format is read by ForeFire's
from `tests/runANN/ANNTest.cpp`, and the `.ffann` format is read by ForeFire's
own evaluator.

The check is the root mean squared error between what the network predicts and
Expand Down
File renamed without changes.
Loading