Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update docker build to cuda 12.3.1 #125

Merged
merged 4 commits into from
Jan 9, 2024
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
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM nvidia/cuda:11.4.2-devel-ubuntu20.04 AS base
FROM nvidia/cuda:12.3.1-devel-ubuntu20.04 AS base

RUN apt-get update && \
apt-get upgrade -y
Expand All @@ -15,7 +15,7 @@ RUN rm -rf /SCAMP/build
RUN mkdir /SCAMP/build && cd /SCAMP/build && cmake -DSCAMP_ENABLE_BINARY_DISTRIBUTION=1 -DBUILD_CLIENT_SERVER=1 -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang .. && make -j8

# We only need the CUDA runtime for the final container
FROM nvidia/cuda:11.4.2-runtime-ubuntu20.04
FROM nvidia/cuda:12.3.1-runtime-ubuntu20.04

# Copy the SCAMP binaries and tests to the final container
RUN mkdir /SCAMP
Expand Down
5 changes: 0 additions & 5 deletions cmake/SCAMPMacros.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -58,21 +58,16 @@ endmacro()
macro(set_cuda_architectures)
message(STATUS "CUDA VERSION: ${CMAKE_CUDA_COMPILER_VERSION}")
if (CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL "11.1")
message(STATUS "GE 11.1")
list(APPEND CMAKE_CUDA_ARCHITECTURES 86)
#set(CUDA_GENCODE_FLAGS "${CUDA_GENCODE_FLAGS} -gencode arch=compute_86,code=sm_86")
endif()
if (CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL "11.5")
message(STATUS "GE 11.5")
list(APPEND CMAKE_CUDA_ARCHITECTURES 87)
endif()
if (CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL "11.8")
message(STATUS "GE 11.8")
list(APPEND CMAKE_CUDA_ARCHITECTURES 89 90)
endif()
list(APPEND CMAKE_CUDA_ARCHITECTURES 60 61 62 70 72 75 80)
if (CMAKE_CUDA_COMPILER_VERSION VERSION_LESS "12")
message(STATUS "L 12")
list(APPEND CMAKE_CUDA_ARCHITECTURES 35 37 50 52 53)
endif()

Expand Down
3 changes: 3 additions & 0 deletions src/distributed/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
include(SCAMPMacros)

# Fix for https://github.com/protocolbuffers/protobuf/issues/12185
set(ABSL_ENABLE_INSTALL ON)

add_subdirectory(${CMAKE_SOURCE_DIR}/third_party/grpc ${CMAKE_CURRENT_BINARY_DIR}/grpc EXCLUDE_FROM_ALL)

# After using add_subdirectory, we can now use the grpc targets directly from
Expand Down
1 change: 1 addition & 0 deletions src/distributed/distributed_job.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#pragma once
#include <chrono>
#include <mutex>
#include <queue>
#include <unordered_map>

Expand Down
2 changes: 1 addition & 1 deletion third_party/grpc
Submodule grpc updated 9439 files