Skip to content

Commit

Permalink
Merge branch 'develop' into woptim/shared-ci-update
Browse files Browse the repository at this point in the history
  • Loading branch information
adrienbernede committed Jul 17, 2024
2 parents f9c6656 + b2e32a4 commit bb758d6
Show file tree
Hide file tree
Showing 5 changed files with 65 additions and 111 deletions.
62 changes: 62 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
on: push
name: Build
jobs:
build_docker:
strategy:
matrix:
target: [gcc, clang, hip, cuda]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
submodules: recursive
- uses: docker/setup-buildx-action@v3
- uses: docker/build-push-action@v6
with:
target: ${{ matrix.target }}
build_mac:
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
with:
submodules: recursive
- uses: threeal/[email protected]
with:
build-dir: build
options:
ENABLE_WARNINGS_AS_ERRORS=Off
UMPIRE_ENABLE_DEVELOPER_DEFAULTS=On
UMPIRE_ENABLE_DEVELOPER_BENCHMARKS=On
CMAKE_BUILD_TYPE=Release
run-build: true
build-args: '--parallel 16'
- uses: threeal/[email protected]
build_windows:
strategy:
matrix:
shared:
- args:
BUILD_SHARED_LIBS=On
CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=On
- args: BUILD_SHARED_LIBS=Off

runs-on: windows-latest
steps:
- uses: actions/checkout@v2
with:
submodules: recursive
- uses: threeal/[email protected]
with:
build-dir: build
options:
ENABLE_WARNINGS_AS_ERRORS=Off
UMPIRE_ENABLE_FILESYSTEM=On
UMPIRE_ENABLE_TOOLS=Off
UMPIRE_ENABLE_DEVELOPER_BENCHMARKS=On
UMPIRE_ENABLE_BENCHMARKS=Off
BLT_CXX_STD=""
CMAKE_CXX_STANDARD=17
CMAKE_BUILD_TYPE=Release
${{ matrix.shared.args }}
run-build: true
build-args: '--parallel 16'
2 changes: 1 addition & 1 deletion .uberenv_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"package_final_phase" : "initconfig",
"package_source_dir" : "../..",
"spack_url": "https://github.com/spack/spack.git",
"spack_branch": "develop-2024-05-26",
"spack_branch": "develop-2024-07-07",
"spack_activate" : {},
"spack_configs_path": "scripts/radiuss-spack-configs",
"spack_packages_path": "scripts/radiuss-spack-configs/packages",
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ FROM ghcr.io/llnl/radiuss:ubuntu-22.04-cuda-12-3 AS cuda
ENV GTEST_COLOR=1
COPY . /home/umpire/workspace
WORKDIR /home/umpire/workspace/build
RUN cmake -DUMPIRE_ENABLE_DEVELOPER_DEFAULTS=On -DCMAKE_CXX_COMPILER=g++ -DENABLE_CUDA=On .. && \
RUN cmake -DUMPIRE_ENABLE_DEVELOPER_DEFAULTS=On -DCMAKE_CXX_COMPILER=g++ -DENABLE_CUDA=On -DCMAKE_CUDA_COMPILER=/usr/local/cuda/bin/nvcc -DCMAKE_CUDA_ARCHITECTURES=70 .. && \
make -j 16

# TODO: switch to ROCM 6
Expand Down
108 changes: 0 additions & 108 deletions azure-pipelines.yml

This file was deleted.

0 comments on commit bb758d6

Please sign in to comment.