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 spdlog and python2 dependency. #202

Merged
merged 1 commit into from
Jan 20, 2020
Merged

Remove spdlog and python2 dependency. #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,7 @@ if(BUILD_CPP_LIB)
list(APPEND NBLA_INCLUDE_DIRS
${PROJECT_SOURCE_DIR}/include
${NNABLA_DIR}/include
${CMAKE_CURRENT_SOURCE_DIR}/third_party/eigen-git-mirror-3.3.5
${CMAKE_CURRENT_SOURCE_DIR}/third_party/spdlog-0.16.3/include)
${CMAKE_CURRENT_SOURCE_DIR}/third_party/eigen-git-mirror-3.3.5)
include_directories(${NBLA_INCLUDE_DIRS};${PROJECT_BINARY_DIR})

###############################################################################
Expand Down
10 changes: 5 additions & 5 deletions build-tools/make/build-with-docker.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ else
endif


.PHONY: docker_image_build_cuda$(DOCKER_IMAGE_TARGET_SUFFIX)
docker_image_build_cuda$(DOCKER_IMAGE_TARGET_SUFFIX):
.PHONY: docker_image_build_cuda
docker_image_build_cuda:
if ! docker image inspect $(DOCKER_IMAGE_BUILD_NNABLA_EXT_CUDA) >/dev/null 2>/dev/null; then \
docker pull $(DOCKER_IMAGE_BUILD_CUDA_BASE) && \
(cd $(NNABLA_EXT_CUDA_DIRECTORY) && docker build $(DOCKER_BUILD_ARGS)\
Expand All @@ -75,8 +75,8 @@ docker_image_build_cuda$(DOCKER_IMAGE_TARGET_SUFFIX):
.) \
fi

.PHONY: docker_image_build_cuda_multi_gpu$(DOCKER_IMAGE_TARGET_SUFFIX)
docker_image_build_cuda_multi_gpu$(DOCKER_IMAGE_TARGET_SUFFIX):
.PHONY: docker_image_build_cuda_multi_gpu
docker_image_build_cuda_multi_gpu:
if ! docker image inspect $(DOCKER_IMAGE_BUILD_NNABLA_EXT_CUDA_MULTI_GPU) >/dev/null 2>/dev/null; then \
docker pull $(DOCKER_IMAGE_BUILD_CUDA_MULTI_GPU_BASE) && \
(cd $(NNABLA_EXT_CUDA_DIRECTORY) && docker build $(DOCKER_BUILD_ARGS) \
Expand All @@ -92,7 +92,7 @@ docker_image_build_cuda_multi_gpu$(DOCKER_IMAGE_TARGET_SUFFIX):
# Auto Format

.PHONY: bwd-nnabla-ext-cuda-auto-format
bwd-nnabla-ext-cuda-auto-format: docker_image_auto_format$(DOCKER_IMAGE_TARGET_SUFFIX)
bwd-nnabla-ext-cuda-auto-format: docker_image_auto_format
cd $(NNABLA_EXT_CUDA_DIRECTORY) \
&& docker run $(DOCKER_RUN_OPTS) $(DOCKER_IMAGE_AUTO_FORMAT) make -f build-tools/make/build.mk nnabla-ext-cuda-auto-format

Expand Down
2 changes: 1 addition & 1 deletion build-tools/make/build.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ nnabla-ext-cuda-clean-all:
.PHONY: nnabla-auto-format
nnabla-ext-cuda-auto-format:
cd $(NNABLA_EXT_CUDA_DIRECTORY) && \
python $(NNABLA_DIRECTORY)/build-tools/auto_format . --exclude \
python3 $(NNABLA_DIRECTORY)/build-tools/auto_format . --exclude \
'\./src/nbla/cuda(/cudnn)?/(function|solver)/\w+\.cu' \
'\./src/nbla/cuda(/cudnn)?/init.cpp' \
'\./python/src/nnabla_ext/(cuda|cudnn)/.*.(cpp|hpp|h|c)'
Expand Down
1 change: 0 additions & 1 deletion third_party/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,3 @@ if(BUILD_TEST)
endif()

download_and_extract_third_party_library(eigen-git-mirror-3.3.5 https://github.com/eigenteam/eigen-git-mirror/archive/3.3.5.zip)
download_and_extract_third_party_library(spdlog-0.16.3 https://github.com/gabime/spdlog/archive/v0.16.3.zip)