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 nwx_build_environment/add_catch2.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
FROM nwx_buildenv:latest

ARG VERSION=3.6.0
ARG COMPILER=gcc-13
ARG COMPILER=gcc-14

# Install catch2 ##
RUN cd /tmp \
Expand Down
2 changes: 1 addition & 1 deletion nwx_build_environment/add_cereal.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
FROM nwx_buildenv:latest

ARG VERSION=1.3.0
ARG COMPILER=gcc-13
ARG COMPILER=gcc-14

# Install cereal
RUN cd /tmp \
Expand Down
2 changes: 1 addition & 1 deletion nwx_build_environment/add_gauxc.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
FROM nwx_buildenv:latest

ARG VERSION=71008cffd5d13d5ee813fb13d14d8bf7b06b8f6e
ARG COMPILER=gcc-13
ARG COMPILER=gcc-14

# Install libfort ##
RUN cd /tmp \
Expand Down
2 changes: 1 addition & 1 deletion nwx_build_environment/add_libfort.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
FROM nwx_buildenv:latest

ARG VERSION=0.4.2
ARG COMPILER=gcc-13
ARG COMPILER=gcc-14

# Install libfort ##
RUN cd /tmp \
Expand Down
2 changes: 1 addition & 1 deletion nwx_build_environment/add_libint.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
FROM nwx_buildenv:latest

ARG VERSION=2.9.0
ARG COMPILER=gcc-13
ARG COMPILER=gcc-14

# Install libfort ##
RUN cd /tmp \
Expand Down
2 changes: 1 addition & 1 deletion nwx_build_environment/add_spdlog.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
FROM nwx_buildenv:latest

ARG VERSION=ad0e89cbfb4d0c1ce4d097e134eb7be67baebb36
ARG COMPILER=gcc-13
ARG COMPILER=gcc-14

# Install spdlog
RUN cd /tmp \
Expand Down
4 changes: 2 additions & 2 deletions nwx_build_environment/buildenv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ docker build -t nwx_buildenv -f nwx_buildenv.dockerfile .
deps=("cereal" "gauxc" "libfort" "spdlog" "libint")
for dep in "${deps[@]}"
do
docker build -t nwx_buildenv -f add_${dep}.dockerfile --build-arg COMPILER=gcc-13 .
docker build -t nwx_buildenv -f add_${dep}.dockerfile --build-arg COMPILER=clang-14 .
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 image prune -f
done

Expand Down
4 changes: 2 additions & 2 deletions nwx_build_environment/nwx_buildenv.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ FROM ubuntu:noble

RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install -y \
gcc-13 g++-13 \
clang-14 libc++-14-dev libc++abi-14-dev \
gcc-14 g++-14 \
clang-19 libc++-19-dev libc++abi-19-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-14)
set(CMAKE_CXX_COMPILER clang++-14)
set(CMAKE_C_COMPILER clang-19)
set(CMAKE_CXX_COMPILER clang++-19)

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.

set(CMAKE_C_COMPILER gcc-13)
set(CMAKE_CXX_COMPILER g++-13)
set(CMAKE_C_COMPILER gcc-14)
set(CMAKE_CXX_COMPILER g++-14)
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-14.cmake)
include(/toolchains/clang-19.cmake)
include(/toolchains/nwx_base.cmake)
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/gcc-13.cmake)
include(/toolchains/gcc-14.cmake)
include(/toolchains/nwx_base.cmake)