Ignore:
Timestamp:
Apr 22, 2015, 12:12:53 PM (5 years ago)
Author:
hum@…
Message:

caffe: update to 20150418

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/math/caffe/files/patch-Makefile.diff

    r133390 r135284  
    1 --- Makefile.orig       2015-02-21 05:20:23.000000000 +0900
    2 +++ Makefile    2015-02-22 14:29:16.000000000 +0900
     1--- Makefile.orig       2015-04-18 04:26:48.000000000 +0900
     2+++ Makefile    2015-04-18 21:21:56.000000000 +0900
    33@@ -162,9 +162,9 @@
    44        LIBRARIES := cudart cublas curand
     
    1313 
    1414 ##############################
    15 @@ -231,12 +231,12 @@
     15@@ -232,7 +232,7 @@
    1616 # clang++ instead of g++
    1717 # libstdc++ for NVCC compatibility on OS X >= 10.9 with CUDA < 7.0
    1818 ifeq ($(OSX), 1)
    1919-       CXX := /usr/bin/clang++
    20 -       CUDA_VERSION := $(shell $(CUDA_DIR)/bin/nvcc -V | grep -o 'release \d' | grep -o '\d')
    21 -       ifeq ($(shell echo $(CUDA_VERSION) \< 7.0 | bc), 1)
    22 -               CXXFLAGS += -stdlib=libstdc++
    23 -               LINKFLAGS += -stdlib=libstdc++
    24 -       endif
    2520+       CXX ?= /usr/bin/clang++
    26 +#      CUDA_VERSION := $(shell $(CUDA_DIR)/bin/nvcc -V | grep -o 'release \d' | grep -o '\d')
    27 +#      ifeq ($(shell echo $(CUDA_VERSION) \< 7.0 | bc), 1)
    28 +#              CXXFLAGS += -stdlib=libstdc++
    29 +#              LINKFLAGS += -stdlib=libstdc++
    30 +#      endif
    31         # clang throws this warning for cuda headers
    32         WARNINGS += -Wno-unneeded-internal-declaration
    33         # gtest needs to use its own tuple to not conflict with clang
    34 @@ -338,7 +338,7 @@
     21        ifneq ($(CPU_ONLY), 1)
     22                CUDA_VERSION := $(shell $(CUDA_DIR)/bin/nvcc -V | grep -o 'release \d' | grep -o '\d')
     23                ifeq ($(shell echo $(CUDA_VERSION) \< 7.0 | bc), 1)
     24@@ -341,7 +341,7 @@
    3525 
    3626 # Complete build flags.
     
    4131 # mex may invoke an older gcc that is too liberal with -Wuninitalized
    4232 MATLAB_CXXFLAGS := $(CXXFLAGS) -Wno-uninitialized
    43 @@ -537,7 +537,7 @@
     33@@ -540,7 +540,7 @@
    4434 # Target for extension-less symlinks to tool binaries with extension '*.bin'.
    4535 $(TOOL_BUILD_DIR)/%: $(TOOL_BUILD_DIR)/%.bin | $(TOOL_BUILD_DIR)
Note: See TracChangeset for help on using the changeset viewer.