Skip to content

Update cmake to use C++17 #1067

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.

Sign up for GitHub

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

Merged
lockshaw merged 2 commits into from
Sep 1, 2023
Merged

Update cmake to use C++17 #1067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f377089
Bump c++ version to 17
lockshaw Aug 28, 2023
868091c
Merge remote-tracking branch 'origin/repo-refactor' into feat/repo-re…
lockshaw Sep 1, 2023
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
33 changes: 0 additions & 33 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion cmake/flexflow-utils.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ 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}
Expand Down Expand Up @@ -33,7 +34,7 @@ endfunction()
function(ff_set_cxx_properties target)
set_target_properties(${target}
PROPERTIES
CXX_STANDARD 11
CXX_STANDARD 17
CXX_STANDARD_REQUIRED YES
CXX_EXTENSIONS NO
)
Expand Down
20 changes: 0 additions & 20 deletions lib/utils/include/utils/tuple.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down