Skip to content
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
2 changes: 1 addition & 1 deletion .github/workflows/test_nwx_library.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ on:
description: "String of a JSON list of compilers to test"
type: string
required: false
default: '["gcc-11", "clang-14"]'
default: '["gcc-14", "clang-18"]'
repo_toolchain:
description: "Path (from repo root) to a CMake toolchain for repo specific settings"
type: string
Expand Down
1 change: 0 additions & 1 deletion nwx_build_environment/add_gauxc.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ RUN cd /tmp \
&& git checkout ${VERSION} \
&& cmake -Bbuild -H. -GNinja \
-DGAUXC_ENABLE_HDF5=OFF \
-DGAUXC_ENABLE_OPENMP=OFF \
-DBUILD_TESTING=OFF \
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
-DCMAKE_INSTALL_PREFIX=/nwx_dependencies/${COMPILER} \
Expand Down
2 changes: 1 addition & 1 deletion nwx_build_environment/buildenv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ deps=("cereal" "gauxc" "libfort" "spdlog" "libint")
for dep in "${deps[@]}"
do
docker build -t nwx_buildenv -f add_${dep}.dockerfile --build-arg COMPILER=gcc-14 .
docker build -t nwx_buildenv -f add_${dep}.dockerfile --build-arg COMPILER=clang-19 .
docker build -t nwx_buildenv -f add_${dep}.dockerfile --build-arg COMPILER=clang-18 .
docker image prune -f
done

Expand Down
2 changes: 1 addition & 1 deletion nwx_build_environment/nwx_buildenv.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ FROM ubuntu:noble
RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install -y \
gcc-14 g++-14 \
clang-19 libc++-19-dev libc++abi-19-dev \
clang-18 libc++-18-dev libc++abi-18-dev \
libomp-dev \
doxygen \
graphviz \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.

set(CMAKE_C_COMPILER clang-19)
set(CMAKE_CXX_COMPILER clang++-19)
set(CMAKE_C_COMPILER clang-18)
set(CMAKE_CXX_COMPILER clang++-18)

set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++ -lc++abi")
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.

include(/toolchains/clang-19.cmake)
include(/toolchains/clang-18.cmake)
include(/toolchains/nwx_base.cmake)