From: Evan Shelhamer <shelhamer@imaginarynumber.net>
Date: Fri, 16 Jan 2015 05:04:43 +0000 (-0800)
Subject: Merge pull request #1236 from mlapin/legacy_nvcc_support
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7695db9000a66127facb6ecd52a355b9153f1440;p=platform%2Fupstream%2Fcaffe.git

Merge pull request #1236 from mlapin/legacy_nvcc_support

Drop OpenCV includes from NVCC code for legacy reasons.
---

7695db9000a66127facb6ecd52a355b9153f1440
diff --cc Makefile
index 2d82e05,dcd7b24..d47df30
--- a/Makefile
+++ b/Makefile
@@@ -234,15 -242,14 +234,14 @@@ endi
  # libstdc++ instead of libc++ for CUDA compatibility on 10.9
  ifeq ($(OSX), 1)
  	CXX := /usr/bin/clang++
 +	CXXFLAGS += -stdlib=libstdc++
 +	LINKFLAGS += -stdlib=libstdc++
  	# clang throws this warning for cuda headers
  	WARNINGS += -Wno-unneeded-internal-declaration
 -	ifneq ($(findstring 10.9, $(shell sw_vers -productVersion)),)
 -		CXXFLAGS += -stdlib=libstdc++
 -		LINKFLAGS += -stdlib=libstdc++
 -	endif
 +	# gtest needs to use its own tuple to not conflict with clang
 +	CXXFLAGS += -DGTEST_USE_OWN_TR1_TUPLE=1
  	# boost::thread is called boost_thread-mt to mark multithreading on OS X
  	LIBRARIES += boost_thread-mt
- 	NVCCFLAGS += -DOSX
  endif
  
  # Custom compiler
diff --cc include/caffe/data_transformer.hpp
index 84ebba2,70e7436..0cfb5dc
--- a/include/caffe/data_transformer.hpp
+++ b/include/caffe/data_transformer.hpp
@@@ -62,11 -58,9 +58,9 @@@ class DataTransformer 
     *    cv::Mat containing the data to be transformed.
     * @param transformed_blob
     *    This is destination blob. It can be part of top blob's data if
 -   *    set_cpu_data() is used See image_data_layer.cpp for an example.
 +   *    set_cpu_data() is used. See image_data_layer.cpp for an example.
     */
- #ifndef OSX
    void Transform(const cv::Mat& cv_img, Blob<Dtype>* transformed_blob);
- #endif
  
    /**
     * @brief Applies the same transformation defined in the data layer's