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

Move default third party dir into build dir #5230

Merged
merged 6 commits into from
Jun 18, 2021
Merged

Move default third party dir into build dir #5230

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6b747ce
Update CMakeLists.txt
jackalcooper Jun 18, 2021
ef19e69
refine
jackalcooper Jun 18, 2021
b148a4a
Merge branch 'master' of https://github.com/Oneflow-Inc/oneflow into …
jackalcooper Jun 18, 2021
c21dfd3
refine
jackalcooper Jun 18, 2021
f1de510
Merge branch 'master' into mv-default-third-party-dir-into-build-dir-1
oneflow-ci-bot Jun 18, 2021
e620b4f
Merge branch 'master' into mv-default-third-party-dir-into-build-dir-1
oneflow-ci-bot Jun 18, 2021
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
6 changes: 4 additions & 2 deletions .github/workflows/simple.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Cancel previous runs of outdated commit
if: github.ref != 'refs/heads/master'
uses: styfle/cancel-workflow-action@0.9.0
with:
access_token: ${{ github.token }}
Expand Down Expand Up @@ -81,16 +82,17 @@ jobs:
run: |
set -x
mkdir -p build-third_party
mkdir -p third_party_install
cd build-third_party
cmake .. ${{ env.cmake_flags }} -DTHIRD_PARTY=ON -DONEFLOW=OFF
cmake .. ${{ env.cmake_flags }} -DTHIRD_PARTY=ON -DONEFLOW=OFF -DTHIRD_PARTY_DIR=$(realpath ../third_party_install)
make -j $(nproc)
shell: bash
- name: Build (of_ccobj)
if: startsWith(runner.os, 'Linux')
run: |
mkdir -p build
cd build
cmake .. ${{ env.cmake_flags }} -DTHIRD_PARTY=OFF -DONEFLOW=ON
cmake .. ${{ env.cmake_flags }} -DTHIRD_PARTY=OFF -DONEFLOW=ON -DTHIRD_PARTY_DIR=$(realpath ../third_party_install)
make -j ${{ matrix.make_concurrency }} of_ccobj
shell: bash
- name: Build (oneflow_internal)
Expand Down
12 changes: 6 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,17 +81,17 @@ if (OF_SOFTMAX_USE_FAST_MATH)
endif()
if (RPC_BACKEND MATCHES "GRPC")
add_definitions(-DRPC_BACKEND_GRPC)
message("-- RPC backend enabled: gRPC")
message(STATUS "RPC backend enabled: gRPC")
set(SUPPORTED_RPC_BACKEND_FOUND 1)
endif()
add_definitions(-DRPC_BACKEND_LOCAL)
message("-- RPC backend enabled: local")
message(STATUS "RPC backend enabled: local")
enable_testing()
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)

set(THIRD_PARTY_DIR "${PROJECT_SOURCE_DIR}/third_party"
CACHE PATH "Where the third party headers and libs are put")
set(THIRD_PARTY_DIR "${PROJECT_BINARY_DIR}/third_party_install"
CACHE PATH "Where to install third party headers and libs")

set(THIRD_PARTY_SUBMODULE_DIR "${PROJECT_SOURCE_DIR}/build/third_party"
CACHE PATH "Where the third party submodules are")
Expand Down Expand Up @@ -168,10 +168,10 @@ if (BUILD_CUDA)
foreach(CUDA_NVCC_GENCODE ${CUDA_NVCC_GENCODES})
list(APPEND CUDA_NVCC_FLAGS -gencode ${CUDA_NVCC_GENCODE})
endforeach()
message("-- CUDA_NVCC_FLAGS: " ${CUDA_NVCC_FLAGS})
message(STATUS "CUDA_NVCC_FLAGS: " ${CUDA_NVCC_FLAGS})
endif()

message("-- CMAKE_CXX_COMPILER_VERSION: " ${CMAKE_CXX_COMPILER_VERSION})
message(STATUS "CMAKE_CXX_COMPILER_VERSION: " ${CMAKE_CXX_COMPILER_VERSION})

if (THIRD_PARTY)
add_custom_target(prepare_oneflow_third_party ALL DEPENDS ${oneflow_third_party_dependencies})
Expand Down