From bf12c339507a45e2d552f5c0b6adff2344169f2a Mon Sep 17 00:00:00 2001
From: Zach Zimmerman <zpzimmerman@gmail.com>
Date: Mon, 8 Jan 2024 00:43:00 -0800
Subject: [PATCH 1/4] Update Docker image to use CUDA 12.3.1

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a174d6d..af3862f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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
@@ -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

From 9e4e3533c26a0d57973ec65089e3ae8c6d227993 Mon Sep 17 00:00:00 2001
From: Zach Zimmerman <zpzimmerman@gmail.com>
Date: Mon, 8 Jan 2024 00:44:57 -0800
Subject: [PATCH 2/4] Update grpc submodule to v1.60.0

---
 third_party/grpc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/third_party/grpc b/third_party/grpc
index b0f37a2..0ef13a7 160000
--- a/third_party/grpc
+++ b/third_party/grpc
@@ -1 +1 @@
-Subproject commit b0f37a22bbae12a4b225a88be6d18d5e41dce881
+Subproject commit 0ef13a7555dbaadd4633399242524129eef5e231

From 1c803117e1dd4377f3a62f91ffd9435f2cb0bae1 Mon Sep 17 00:00:00 2001
From: Zach Zimmerman <zpzimmerman@gmail.com>
Date: Mon, 8 Jan 2024 17:22:22 -0800
Subject: [PATCH 3/4] Fix client/server build issue with new grpc.

---
 src/distributed/CMakeLists.txt    | 3 +++
 src/distributed/distributed_job.h | 1 +
 2 files changed, 4 insertions(+)

diff --git a/src/distributed/CMakeLists.txt b/src/distributed/CMakeLists.txt
index 8de019e..744340c 100644
--- a/src/distributed/CMakeLists.txt
+++ b/src/distributed/CMakeLists.txt
@@ -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
diff --git a/src/distributed/distributed_job.h b/src/distributed/distributed_job.h
index 14fba4f..3509060 100644
--- a/src/distributed/distributed_job.h
+++ b/src/distributed/distributed_job.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <chrono>
+#include <mutex>
 #include <queue>
 #include <unordered_map>
 

From f12a2ef48b3569b063287306659f5ea127639bc8 Mon Sep 17 00:00:00 2001
From: Zach Zimmerman <zpzimmerman@gmail.com>
Date: Mon, 8 Jan 2024 17:30:26 -0800
Subject: [PATCH 4/4] [skip ci] Remove extraneous cmake messages from SCAMP
 builds.

---
 cmake/SCAMPMacros.cmake | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/cmake/SCAMPMacros.cmake b/cmake/SCAMPMacros.cmake
index 9cd5c84..ba043dd 100644
--- a/cmake/SCAMPMacros.cmake
+++ b/cmake/SCAMPMacros.cmake
@@ -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()