# 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
* 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