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/ci-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ jobs:
with:
submodules: recursive
- name: Check ${{ matrix.check_type }}
run: ./scripts/github-actions/linux-check.sh
run: ./scripts/github-actions/linux-check.sh
- name: Upload coverage to Codecov
if: ${{ matrix.check_type == 'coverage' }}
uses: codecov/codecov-action@v4
Expand Down
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ variables:
# Build source and run unit tests.
- echo -e "section_start:$(date +%s):src_build_and_unit_test\r\e[0K
Source Build and Unit Tests ${CI_PROJECT_NAME}"
- ${ALLOC_COMMAND} python3 scripts/llnl/build_src.py -v --host-config=${HOST_CONFIG} --extra-cmake-options=${EXTRA_CMAKE_OPTIONS} ${EXTRA_BUILD_OPTIONS}
- ${ALLOC_COMMAND} python3 scripts/llnl/build_src.py -v --host-config=${HOST_CONFIG} --extra-cmake-options="${EXTRA_CMAKE_OPTIONS}" ${EXTRA_BUILD_OPTIONS}
- echo -e "section_end:$(date +%s):src_build_and_unit_test\r\e[0K"
artifacts:
expire_in: 2 weeks
Expand Down
6 changes: 3 additions & 3 deletions .gitlab/build_blueos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
# This is the share configuration of jobs for blueos
.on_blueos:
variables:
ALLOC_COMMAND: lalloc ${ALLOC_NODES} -W ${ALLOC_TIME} -q pci
SCHEDULER_PARAMETERS: -nnodes ${ALLOC_NODES} -W ${ALLOC_TIME} -q pci -G ${ALLOC_BANK}
tags:
- shell
- batch
- lassen
rules:
- if: '$CI_COMMIT_BRANCH =~ /_lnone/ || $ON_BLUEOS == "OFF"' #run except if ...
Expand All @@ -25,7 +25,7 @@
# like we do in config-build
- module load cmake/3.23.1
# Workaround for multiple before_scripts - see https://gitlab.com/gitlab-org/gitlab-runner/-/issues/2301
# See also https://github.com/LLNL/serac/pull/417#discussion_r631194968
# See also https://github.com/LLNL/smith/pull/417#discussion_r631194968
- if [[ $CUDA_BUILD == "ON" ]]; then module load cuda/11.8.0; fi

####
Expand Down
9 changes: 5 additions & 4 deletions .gitlab/build_toss4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,18 @@

####
# Build jobs
toss4-clang_19_1_3-src:

toss4-llvm_19_1_3-src:
variables:
COMPILER: "clang@19.1.3"
COMPILER: "llvm@19.1.3"
HOST_CONFIG: "dane-toss_4_x86_64_ib-${COMPILER}.cmake"
ALLOC_NODES: "1"
ALLOC_TIME: "30"
extends: .src_build_on_toss4

toss4-clang_19_1_3-src-release:
toss4-llvm_19_1_3-src-codevelop:
variables:
COMPILER: "clang@19.1.3"
COMPILER: "llvm@19.1.3"
HOST_CONFIG: "dane-toss_4_x86_64_ib-${COMPILER}.cmake"
EXTRA_CMAKE_OPTIONS: "-DCMAKE_BUILD_TYPE=Release"
ALLOC_NODES: "1"
Expand Down
9 changes: 4 additions & 5 deletions .gitlab/build_toss4_cray.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@
.on_toss4_cray:
variables:
SCHEDULER_PARAMETERS: "--queue pci --exclusive --time-limit=${ALLOC_TIME}m --nodes=${ALLOC_NODES}"
COMPILER: "[email protected]"
HOST_CONFIG: "tuolumne-toss_4_x86_64_ib_cray-${COMPILER}_hip.cmake"
tags:
- batch
- tioga
- tuolumne
rules:
- if: '$CI_COMMIT_BRANCH =~ /_qnone/ || $ON_TOSS4_CRAY == "OFF"' #run except if ...
when: never
Expand All @@ -27,11 +29,8 @@

####
# Build jobs
toss4_cray-rocmcc_6_2_1-src:
toss4_cray-llvm_amdgpu_6_4_2-src:
variables:
COMPILER: "[email protected]"
HOST_CONFIG: "tioga-toss_4_x86_64_ib_cray-${COMPILER}_hip.cmake"
ALLOC_NODES: "1"
ALLOC_TIME: "30"
extends: .src_build_on_toss4_cray

2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ if ("${PROJECT_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
endif()
endforeach()

set(BLT_REQUIRED_CLANGFORMAT_VERSION "14" CACHE STRING "")
set(BLT_REQUIRED_CLANGFORMAT_VERSION "19" CACHE STRING "")
endif()

include(${BLT_SOURCE_DIR}/SetupBLT.cmake)
Expand Down
12 changes: 6 additions & 6 deletions config-build.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
import shutil
import socket

_host_configs_map = {"rzgenie" : "rzwhippet-toss_4_x86_64_ib-[email protected].cmake",
"rzwhippet" : "rzwhippet-toss_4_x86_64_ib-[email protected].cmake",
_host_configs_map = {"rzgenie" : "rzwhippet-toss_4_x86_64_ib-[email protected].cmake",
"rzwhippet" : "rzwhippet-toss_4_x86_64_ib-[email protected].cmake",
"rzvernal" : "[email protected]_hip.cmake",
"rzansel" : "[email protected]_cuda.cmake",
"dane" : "dane-toss_4_x86_64_ib-clang@19.1.3.cmake",
"tioga" : "tioga-toss_4_x86_64_ib_cray-rocmcc@6.2.1_hip.cmake",
"lassen" : "[email protected]_cuda.cmake"}
"rzadams" : "[email protected]_hip.cmake",
"dane" : "dane-toss_4_x86_64_ib-llvm@19.1.3.cmake",
"tioga" : "tuolumne-toss_4_x86_64_ib_cray-llvm-amdgpu@6.4.2_hip.cmake",
"tuolumne" : "[email protected]_hip.cmake"}

def get_machine_name():
return socket.gethostname().rstrip('1234567890')
Expand Down
108 changes: 0 additions & 108 deletions host-configs/[email protected]

This file was deleted.

Loading