From f37708938a6e5724939fd18513d4621e45eeb213 Mon Sep 17 00:00:00 2001
From: Colin Unger <lockshaw@lockshaw.net>
Date: Mon, 28 Aug 2023 13:53:25 -0700
Subject: [PATCH] Bump c++ version to 17

---
 CMakeLists.txt                  | 33 ---------------------------------
 cmake/flexflow-utils.cmake      | 33 +++++++++++++++++++++++++++++++++
 lib/utils/include/utils/tuple.h | 20 --------------------
 3 files changed, 33 insertions(+), 53 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 241456082b..3bbdf13b22 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,39 +31,6 @@ set(FF_GPU_BACKENDS cuda hip_cuda hip_rocm intel)
 set(FF_GPU_BACKEND "cuda" CACHE STRING "Select GPU Backend ${FF_GPU_BACKENDS}")
 set_property(CACHE FF_GPU_BACKEND PROPERTY STRINGS ${FF_GPU_BACKENDS})
 
-function(define_ff_vars target)
-  target_compile_definitions(${target} PRIVATE 
-    MAX_OPNAME=${FF_MAX_OPNAME}
-    MAX_NUM_OUTPUTS=${FF_MAX_NUM_OUTPUTS}
-    MAX_NUM_INPUTS=${FF_MAX_NUM_INPUTS}
-    MAX_NUM_WEIGHTS=${FF_MAX_NUM_WEIGHTS}
-    MAX_NUM_FUSED_OPERATORS=${FF_MAX_NUM_FUSED_OPERATORS}
-    MAX_NUM_FUSED_TENSORS=${FF_MAX_NUM_FUSED_TENSORS}
-    MAX_NUM_WORKERS=${FF_MAX_NUM_WORKERS}
-    FF_USE_NCCL=${FF_USE_NCCL}
-    MAX_TENSOR_DIM=${FF_MAX_DIM}
-    MAX_NUM_TASK_REGIONS=${FF_MAX_NUM_TASK_REGIONS}
-    MAX_NUM_TASK_ARGUMENTS=${FF_MAX_NUM_TASK_ARGUMENTS}
-    )
-
-  if (FF_GPU_BACKEND STREQUAL "cuda")
-    target_compile_definitions(${target} PRIVATE FF_USE_CUDA)
-  elseif (FF_GPU_BACKEND STREQUAL "hip_cuda")
-    target_compile_definitions(${target} PRIVATE FF_USE_HIP_CUDA)
-  elseif (FF_GPU_BACKEND STREQUAL "hip_rocm")
-    target_compile_definitions(${target} PRIVATE FF_USE_HIP_ROCM)
-  endif()
-endfunction()
-
-function(ff_set_cxx_properties target)
-  set_target_properties(${target}
-    PROPERTIES
-      CXX_STANDARD 11
-      CXX_STANDARD_REQUIRED YES
-      CXX_EXTENSIONS NO
-  )
-endfunction()
-
 option(FF_USE_EXTERNAL_LEGION "Use pre-installed Legion" OFF)
 option(FF_BUILD_RESNET "build resnet example" OFF)
 option(FF_BUILD_RESNEXT "build resnext example" OFF)
diff --git a/cmake/flexflow-utils.cmake b/cmake/flexflow-utils.cmake
index 99db780110..2030f9c33a 100644
--- a/cmake/flexflow-utils.cmake
+++ b/cmake/flexflow-utils.cmake
@@ -7,6 +7,39 @@ macro(ff_parse_args)
   cmake_parse_arguments(${FF_PARSE_ARGS_PREFIX} "${FF_PARSE_ARGS_FLAGS}" "${FF_PARSE_ARGS_ARGS}" "${FF_PARSE_ARGS_VARIADIC_ARGS}" ${FF_PARSE_ARGS_PARSE})
 endmacro()
 
+function(define_ff_vars target)
+  target_compile_definitions(${target} PRIVATE 
+    MAX_OPNAME=${FF_MAX_OPNAME}
+    MAX_NUM_OUTPUTS=${FF_MAX_NUM_OUTPUTS}
+    MAX_NUM_INPUTS=${FF_MAX_NUM_INPUTS}
+    MAX_NUM_WEIGHTS=${FF_MAX_NUM_WEIGHTS}
+    MAX_NUM_FUSED_OPERATORS=${FF_MAX_NUM_FUSED_OPERATORS}
+    MAX_NUM_FUSED_TENSORS=${FF_MAX_NUM_FUSED_TENSORS}
+    MAX_NUM_WORKERS=${FF_MAX_NUM_WORKERS}
+    FF_USE_NCCL=${FF_USE_NCCL}
+    MAX_TENSOR_DIM=${FF_MAX_DIM}
+    MAX_NUM_TASK_REGIONS=${FF_MAX_NUM_TASK_REGIONS}
+    MAX_NUM_TASK_ARGUMENTS=${FF_MAX_NUM_TASK_ARGUMENTS}
+    )
+
+  if (FF_GPU_BACKEND STREQUAL "cuda")
+    target_compile_definitions(${target} PRIVATE FF_USE_CUDA)
+  elseif (FF_GPU_BACKEND STREQUAL "hip_cuda")
+    target_compile_definitions(${target} PRIVATE FF_USE_HIP_CUDA)
+  elseif (FF_GPU_BACKEND STREQUAL "hip_rocm")
+    target_compile_definitions(${target} PRIVATE FF_USE_HIP_ROCM)
+  endif()
+endfunction()
+
+function(ff_set_cxx_properties target)
+  set_target_properties(${target}
+    PROPERTIES
+      CXX_STANDARD 17
+      CXX_STANDARD_REQUIRED YES
+      CXX_EXTENSIONS NO
+  )
+endfunction()
+
 function(ff_add_library)
   ff_parse_args(
     PREFIX 
diff --git a/lib/utils/include/utils/tuple.h b/lib/utils/include/utils/tuple.h
index 76ff2613db..074fbfded4 100644
--- a/lib/utils/include/utils/tuple.h
+++ b/lib/utils/include/utils/tuple.h
@@ -31,26 +31,6 @@ struct index_of : index_of_impl<T, 0, Types...> {};
 
 } // namespace TupleUtils
 
-template <typename T, typename... Types>
-T &get(std::tuple<Types...> &t) noexcept {
-  return std::get<TupleUtils::index_of<T, Types...>::value>(t);
-}
-
-template <typename T, typename... Types>
-T &&get(std::tuple<Types...> &&t) noexcept {
-  return std::move(std::get<TupleUtils::index_of<T, Types...>::value>(t));
-}
-
-template <typename T, typename... Types>
-T const &get(std::tuple<Types...> const &t) noexcept {
-  return std::get<TupleUtils::index_of<T, Types...>::value>(t);
-}
-
-template <typename T, typename... Types>
-T const &&get(std::tuple<Types...> const &&t) noexcept {
-  return move(std::get<TupleUtils::index_of<T, Types...>::value>(t));
-}
-
 template <int Idx, typename Visitor, typename... Types>
 void visit_tuple_impl(Visitor &v, std::tuple<Types...> const &tup) {
   v(Idx, std::get<Idx>(tup));