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.

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

Jump to bottom

remove hardcoded yaml-cpp path from CMakeLists.txt #5

Merged
merged 8 commits into from
Sep 7, 2023
Merged

remove hardcoded yaml-cpp path from CMakeLists.txt #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ee9e3d4
remove hardcoded yaml-cpp path from CMakeLists.txt
TomMelt Aug 31, 2023
1bb519b
Update CMakeLists.txt
TomMelt Sep 6, 2023
efd54d1
Update CMakeLists.txt
TomMelt Sep 6, 2023
c67bc28
Update examples/cpp/cart_pole/CMakeLists.txt
TomMelt Sep 6, 2023
f9a02e2
Update examples/cpp/cart_pole/CMakeLists.txt
TomMelt Sep 6, 2023
c696620
Merge branch 'NVIDIA:master' into remove-hardcoded-paths
TomMelt Sep 6, 2023
218ac7d
add YAML_CPP_ROOT to Dockerfile
TomMelt Sep 6, 2023
533768d
change YAML_CPP_ROOT from env to cmake variable
TomMelt Sep 6, 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
14 changes: 7 additions & 7 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,15 @@ target_include_directories(${PROJECT_NAME}
target_link_libraries(${PROJECT_NAME} PRIVATE ${TORCH_LIBRARIES})
target_link_libraries(${PROJECT_NAME} PRIVATE NVHPC::NCCL)
target_link_libraries(${PROJECT_NAME} PRIVATE NVHPC::MPI_CXX)
target_link_libraries(${PROJECT_NAME} PRIVATE /opt/yaml-cpp/lib/libyaml-cpp.a)
target_link_libraries(${PROJECT_NAME} PRIVATE ${YAML_CPP_ROOT}/lib/libyaml-cpp.a)

target_include_directories(${PROJECT_NAME}
PRIVATE
/opt/yaml-cpp/include
${MPI_CXX_INCLUDE_PATH}
${TORCH_INCLUDE_DIRS}
${NVHPC_CUDA_INCLUDE_DIR}
${NVHPC_NCCL_INCLUDE_DIR}
PRIVATE
${YAML_CPP_ROOT}/include
${MPI_CXX_INCLUDE_PATH}
${TORCH_INCLUDE_DIRS}
${NVHPC_CUDA_INCLUDE_DIR}
${NVHPC_NCCL_INCLUDE_DIR}
)
target_compile_definitions(${PROJECT_NAME} PRIVATE YAML_CPP_STATIC_DEFINE)
target_compile_options(${PROJECT_NAME} PRIVATE $<$<COMPILE_LANGUAGE:CXX>:${TORCH_CXX_FLAGS}>)
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ COPY . /torchfort
RUN cd /torchfort && mkdir build && cd build && \
cmake -DCMAKE_INSTALL_PREFIX=/opt/torchfort \
-DNVHPC_CUDA_VERSION=11.8 \
-DYAML_CPP_ROOT=/opt/yaml-cpp \
-DCMAKE_PREFIX_PATH="`python -c 'import torch;print(torch.utils.cmake_prefix_path)'`;/opt/nvidia/hpc_sdk/Linux_x86_64/23.5/cmake" \
.. && \
make -j install && \
Expand Down
4 changes: 2 additions & 2 deletions examples/cpp/cart_pole/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ target_link_libraries(PyEnvironments PRIVATE environments)
foreach(tgt ${cart_pole_example_targets})
target_include_directories(${tgt}
PRIVATE
/opt/yaml-cpp/include
${YAML_CPP_ROOT}/include
${MPI_CXX_INCLUDE_PATH}
${NVHPC_CUDA_INCLUDE_DIR}
${Python_INCLUDE_DIRS}
Expand All @@ -32,7 +32,7 @@ foreach(tgt ${cart_pole_example_targets})
target_link_libraries(${tgt} PRIVATE ${TORCH_LIBRARIES})
target_link_libraries(${tgt} PRIVATE ${Python_LIBRARIES})
target_link_libraries(${tgt} PRIVATE NVHPC::MPI_CXX)
target_link_libraries(${tgt} PRIVATE /opt/yaml-cpp/lib/libyaml-cpp.a)
target_link_libraries(${tgt} PRIVATE ${YAML_CPP_ROOT}/lib/libyaml-cpp.a)
target_link_libraries(${tgt} PRIVATE environments)
target_compile_options(${tgt} PRIVATE $<$<COMPILE_LANGUAGE:CXX>:${TORCH_CXX_FLAGS}>)
target_link_options(${tgt} PRIVATE $<$<COMPILE_LANGUAGE:CXX>:${TORCH_CXX_FLAGS}>)
Expand Down