mirror of
https://github.com/macports/macports-ports.git
synced 2026-07-12 18:20:25 -07:00
Gerard SoleandZero King
3624e5135a
Port for caffe was old (2015), so this commit upgrades its source to current master stable. It updates required patches so library will install successfuly. Dynamic libraries are amended, so they will point to the correct libcaffe. Current Port, has an issue with python and caffe, that requires manual recolocation of affected library. Also, tests are added for both library and python module.
46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
--- Makefile.config.orig 2017-08-24 10:43:43.000000000 +0900
|
|
+++ Makefile.config 2017-08-24 10:43:54.000000000 +0900
|
|
@@ -5,7 +5,7 @@
|
|
# USE_CUDNN := 1
|
|
|
|
# CPU-only switch (uncomment to build without GPU support).
|
|
-# CPU_ONLY := 1
|
|
+CPU_ONLY := 1
|
|
|
|
# uncomment to disable IO dependencies and corresponding data layers
|
|
# USE_OPENCV := 0
|
|
@@ -25,7 +25,7 @@
|
|
# CUSTOM_CXX := g++
|
|
|
|
# CUDA directory contains bin/ and lib/ directories that we need.
|
|
-CUDA_DIR := /usr/local/cuda
|
|
+# CUDA_DIR := /usr/local/cuda
|
|
# On Ubuntu 14.04, if cuda tools are installed via
|
|
# "sudo apt-get install nvidia-cuda-toolkit" then use this instead:
|
|
# CUDA_DIR := /usr
|
|
@@ -33,15 +33,15 @@
|
|
# CUDA architecture setting: going with all of them.
|
|
# For CUDA < 6.0, comment the *_50 through *_61 lines for compatibility.
|
|
# For CUDA < 8.0, comment the *_60 and *_61 lines for compatibility.
|
|
-CUDA_ARCH := -gencode arch=compute_20,code=sm_20 \
|
|
- -gencode arch=compute_20,code=sm_21 \
|
|
- -gencode arch=compute_30,code=sm_30 \
|
|
- -gencode arch=compute_35,code=sm_35 \
|
|
- -gencode arch=compute_50,code=sm_50 \
|
|
- -gencode arch=compute_52,code=sm_52 \
|
|
- -gencode arch=compute_60,code=sm_60 \
|
|
- -gencode arch=compute_61,code=sm_61 \
|
|
- -gencode arch=compute_61,code=compute_61
|
|
+#CUDA_ARCH := -gencode arch=compute_20,code=sm_20 \
|
|
+# -gencode arch=compute_20,code=sm_21 \
|
|
+# -gencode arch=compute_30,code=sm_30 \
|
|
+# -gencode arch=compute_35,code=sm_35 \
|
|
+# -gencode arch=compute_50,code=sm_50 \
|
|
+# -gencode arch=compute_52,code=sm_52 \
|
|
+# -gencode arch=compute_60,code=sm_60 \
|
|
+# -gencode arch=compute_61,code=sm_61 \
|
|
+# -gencode arch=compute_61,code=compute_61
|
|
|
|
# BLAS choice:
|
|
# atlas for ATLAS (default)
|