[caffe] 01/06: patch: update patch (empty series)

Zhou Mo cdluminate-guest at moszumanska.debian.org
Wed Mar 9 08:41:00 UTC 2016


This is an automated email from the git hooks/post-receive script.

cdluminate-guest pushed a commit to branch debian/experimental
in repository caffe.

commit 0e85e6f8a96e09fad50149f2eafc56c18b0b77c0
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Wed Mar 9 08:16:12 2016 +0000

    patch: update patch (empty series)
---
 debian/patches/remove-ignore.patch                 |  99 -------------------
 debian/patches/series                              |   3 -
 .../unapplied/00-fix-include-path-for-debian.patch |  52 ----------
 .../01-fix-makefile-rpath-and-soname.patch         | 108 ---------------------
 .../unapplied/03-set-cmake-deps-openblas.patch     |  11 ---
 .../unapplied/04-fix-rpath-issue-in-cmake.patch    |  10 --
 .../patches/unapplied/05-set-cmake-cpuonly.patch   |  11 ---
 .../avoid-cmake-configgen-error.patch              |   0
 ...ake-add-target-property-version-soversion.patch |   0
 9 files changed, 294 deletions(-)

diff --git a/debian/patches/remove-ignore.patch b/debian/patches/remove-ignore.patch
deleted file mode 100644
index 094fd4c..0000000
--- a/debian/patches/remove-ignore.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-Remove .gitignore file from upstream, for maintaining convinience.
---- a/.gitignore
-+++ /dev/null
-@@ -1,95 +0,0 @@
--## General
--
--# Compiled Object files
--*.slo
--*.lo
--*.o
--*.cuo
--
--# Compiled Dynamic libraries
--*.so
--*.dylib
--
--# Compiled Static libraries
--*.lai
--*.la
--*.a
--
--# Compiled protocol buffers
--*.pb.h
--*.pb.cc
--*_pb2.py
--
--# Compiled python
--*.pyc
--
--# Compiled MATLAB
--*.mex*
--
--# IPython notebook checkpoints
--.ipynb_checkpoints
--
--# Editor temporaries
--*.swp
--*~
--
--# Sublime Text settings
--*.sublime-workspace
--*.sublime-project
--
--# Eclipse Project settings
--*.*project
--.settings
--
--# QtCreator files
--*.user
--
--# PyCharm files
--.idea
--
--# OSX dir files
--.DS_Store
--
--## Caffe
--
--# User's build configuration
--Makefile.config
--
--# Data and models are either
--# 1. reference, and not casually committed
--# 2. custom, and live on their own unless they're deliberated contributed
--data/*
--models/*
--*.caffemodel
--*.caffemodel.h5
--*.solverstate
--*.solverstate.h5
--*.binaryproto
--*leveldb
--*lmdb
--
--# build, distribute, and bins (+ python proto bindings)
--build
--.build_debug/*
--.build_release/*
--distribute/*
--*.testbin
--*.bin
--python/caffe/proto/
--cmake_build
--.cmake_build
--
--# Generated documentation
--docs/_site
--docs/gathered
--_site
--doxygen
--docs/dev
--
--# LevelDB files
--*.sst
--*.ldb
--LOCK
--LOG*
--CURRENT
--MANIFEST-*
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index bd8033a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-#remove-ignore.patch
-#fix-cmake-add-target-property-version-soversion.patch
-#avoid-cmake-configgen-error.patch
diff --git a/debian/patches/unapplied/00-fix-include-path-for-debian.patch b/debian/patches/unapplied/00-fix-include-path-for-debian.patch
deleted file mode 100644
index b1c9274..0000000
--- a/debian/patches/unapplied/00-fix-include-path-for-debian.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Fix include path in upstream source,
-in order to let compiler find them easier.
---- a/src/caffe/layers/hdf5_data_layer.cpp
-+++ b/src/caffe/layers/hdf5_data_layer.cpp
-@@ -10,8 +10,8 @@
- #include <string>
- #include <vector>
- 
--#include "hdf5.h"
--#include "hdf5_hl.h"
-+#include "hdf5/serial/hdf5.h"
-+#include "hdf5/serial/hdf5_hl.h"
- #include "stdint.h"
- 
- #include "caffe/data_layers.hpp"
---- a/src/caffe/layers/hdf5_data_layer.cu
-+++ b/src/caffe/layers/hdf5_data_layer.cu
-@@ -7,8 +7,8 @@
- #include <string>
- #include <vector>
- 
--#include "hdf5.h"
--#include "hdf5_hl.h"
-+#include "hdf5/serial/hdf5.h"
-+#include "hdf5/serial/hdf5_hl.h"
- 
- #include "caffe/data_layers.hpp"
- #include "caffe/layer.hpp"
---- a/src/caffe/layers/hdf5_output_layer.cpp
-+++ b/src/caffe/layers/hdf5_output_layer.cpp
-@@ -1,7 +1,7 @@
- #include <vector>
- 
--#include "hdf5.h"
--#include "hdf5_hl.h"
-+#include "hdf5/serial/hdf5.h"
-+#include "hdf5/serial/hdf5_hl.h"
- 
- #include "caffe/blob.hpp"
- #include "caffe/common.hpp"
---- a/src/caffe/layers/hdf5_output_layer.cu
-+++ b/src/caffe/layers/hdf5_output_layer.cu
-@@ -1,7 +1,7 @@
- #include <vector>
- 
--#include "hdf5.h"
--#include "hdf5_hl.h"
-+#include "hdf5/serial/hdf5.h"
-+#include "hdf5/serial/hdf5_hl.h"
- 
- #include "caffe/blob.hpp"
- #include "caffe/common.hpp"
diff --git a/debian/patches/unapplied/01-fix-makefile-rpath-and-soname.patch b/debian/patches/unapplied/01-fix-makefile-rpath-and-soname.patch
deleted file mode 100644
index 612955a..0000000
--- a/debian/patches/unapplied/01-fix-makefile-rpath-and-soname.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-Fix rpath issue in upstream Makefile
---- a/Makefile
-+++ b/Makefile
-@@ -1,3 +1,8 @@
-+### start debian
-+# check DYNAMIC_NAME when bumping SONAME
-+SONAME := libcaffe.so.0
-+### end debian
-+
- PROJECT := caffe
- 
- CONFIG_FILE := Makefile.config
-@@ -31,7 +36,7 @@
- # The target shared library name
- LIB_BUILD_DIR := $(BUILD_DIR)/lib
- STATIC_NAME := $(LIB_BUILD_DIR)/lib$(PROJECT).a
--DYNAMIC_NAME := $(LIB_BUILD_DIR)/lib$(PROJECT).so
-+DYNAMIC_NAME := $(LIB_BUILD_DIR)/${SONAME}
- 
- ##############################
- # Get all source files
-@@ -255,7 +260,7 @@
- 	# boost::thread is called boost_thread-mt to mark multithreading on OS X
- 	LIBRARIES += boost_thread-mt
- 	# we need to explicitly ask for the rpath to be obeyed
--	DYNAMIC_FLAGS := -install_name @rpath/libcaffe.so
-+	DYNAMIC_FLAGS := -Wl,-soname,$(SONAME)
- 	ORIGIN := @loader_path
- else
- 	ORIGIN := \$$ORIGIN
-@@ -441,9 +446,15 @@
- 
- $(PY$(PROJECT)_SO): $(PY$(PROJECT)_SRC) $(PY$(PROJECT)_HXX) | $(DYNAMIC_NAME)
- 	@ echo CXX/LD -o $@ $<
--	$(Q)$(CXX) -shared -o $@ $(PY$(PROJECT)_SRC) \
--		-o $@ $(LINKFLAGS) -l$(PROJECT) $(PYTHON_LDFLAGS) \
--		-Wl,-rpath,$(ORIGIN)/../../build/lib
-+	#$(Q)$(CXX) -shared -o $@ $(PY$(PROJECT)_SRC) \
-+	#	-o $@ $(LINKFLAGS) -l$(PROJECT) $(PYTHON_LDFLAGS) \
-+	#	-L$(ORIGIN)/$(LIB_BUILD_DIR)/
-+	echo "$(CXX) -shared -o $@ $(PY$(PROJECT)_SRC) \
-+		-o $@ $(LINKFLAGS) $(PYTHON_LDFLAGS) \
-+		-L$(ORIGIN)/$(LIB_BUILD_DIR)/ -l:$(SONAME)" > build_py_so.sh
-+	sed -i -e 's/-pie//g' -e 's/-fPIE/-fPIE -fPIC/g' build_py_so.sh
-+	sh build_py_so.sh
-+	$(RM) build_py_so.sh
- 
- mat$(PROJECT): mat
- 
-@@ -506,7 +517,13 @@
- 
- $(DYNAMIC_NAME): $(OBJS) | $(LIB_BUILD_DIR)
- 	@ echo LD -o $@
--	$(Q)$(CXX) -shared -o $@ $(OBJS) $(LINKFLAGS) $(LDFLAGS) $(DYNAMIC_FLAGS)
-+	#$(Q)$(CXX) -shared -o $@ $(OBJS) $(LINKFLAGS) $(LDFLAGS) $(DYNAMIC_FLAGS)
-+	echo $(CXX) -shared -o $@ $(OBJS) $(LINKFLAGS) $(LDFLAGS) $(DYNAMIC_FLAGS) \
-+		-Wl,-soname,$(SONAME) > build_so.sh
-+	sed -i -e 's/-pie//g' build_so.sh
-+	sh build_so.sh
-+	$(RM) build_so.sh
-+	sh -c "cd $(LIB_BUILD_DIR); ln -s $(SONAME) libcaffe.so"
- 
- $(STATIC_NAME): $(OBJS) | $(LIB_BUILD_DIR)
- 	@ echo AR -o $@
-@@ -537,19 +554,22 @@
- 		| $(DYNAMIC_NAME) $(TEST_BIN_DIR)
- 	@ echo CXX/LD -o $@ $<
- 	$(Q)$(CXX) $(TEST_MAIN_SRC) $(TEST_OBJS) $(GTEST_OBJ) \
--		-o $@ $(LINKFLAGS) $(LDFLAGS) -l$(PROJECT) -Wl,-rpath,$(ORIGIN)/../lib
-+		-o $@ $(LINKFLAGS) $(LDFLAGS)  \
-+		-L$(ORIGIN)/$(LIB_BUILD_DIR)/ -l:$(SONAME)
- 
- $(TEST_CU_BINS): $(TEST_BIN_DIR)/%.testbin: $(TEST_CU_BUILD_DIR)/%.o \
- 	$(GTEST_OBJ) | $(DYNAMIC_NAME) $(TEST_BIN_DIR)
- 	@ echo LD $<
- 	$(Q)$(CXX) $(TEST_MAIN_SRC) $< $(GTEST_OBJ) \
--		-o $@ $(LINKFLAGS) $(LDFLAGS) -l$(PROJECT) -Wl,-rpath,$(ORIGIN)/../lib
-+		-o $@ $(LINKFLAGS) $(LDFLAGS)  \
-+		-L$(ORIGIN)/$(LIB_BUILD_DIR)/ -l:$(SONAME)
- 
- $(TEST_CXX_BINS): $(TEST_BIN_DIR)/%.testbin: $(TEST_CXX_BUILD_DIR)/%.o \
- 	$(GTEST_OBJ) | $(DYNAMIC_NAME) $(TEST_BIN_DIR)
- 	@ echo LD $<
- 	$(Q)$(CXX) $(TEST_MAIN_SRC) $< $(GTEST_OBJ) \
--		-o $@ $(LINKFLAGS) $(LDFLAGS) -l$(PROJECT) -Wl,-rpath,$(ORIGIN)/../lib
-+		-o $@ $(LINKFLAGS) $(LDFLAGS)  \
-+		-L$(ORIGIN)/$(LIB_BUILD_DIR)/ -l:$(SONAME)
- 
- # Target for extension-less symlinks to tool binaries with extension '*.bin'.
- $(TOOL_BUILD_DIR)/%: $(TOOL_BUILD_DIR)/%.bin | $(TOOL_BUILD_DIR)
-@@ -558,13 +578,13 @@
- 
- $(TOOL_BINS): %.bin : %.o | $(DYNAMIC_NAME)
- 	@ echo CXX/LD -o $@
--	$(Q)$(CXX) $< -o $@ $(LINKFLAGS) -l$(PROJECT) $(LDFLAGS) \
--		-Wl,-rpath,$(ORIGIN)/../lib
-+	$(Q)$(CXX) $< -o $@ $(LINKFLAGS) $(LDFLAGS) \
-+		-L$(ORIGIN)/$(LIB_BUILD_DIR)/ -l:$(SONAME)
- 
- $(EXAMPLE_BINS): %.bin : %.o | $(DYNAMIC_NAME)
- 	@ echo CXX/LD -o $@
--	$(Q)$(CXX) $< -o $@ $(LINKFLAGS) -l$(PROJECT) $(LDFLAGS) \
--		-Wl,-rpath,$(ORIGIN)/../../lib
-+	$(Q)$(CXX) $< -o $@ $(LINKFLAGS) $(LDFLAGS) \
-+		-L$(ORIGIN)/$(LIB_BUILD_DIR)/ -l:$(SONAME)
- 
- proto: $(PROTO_GEN_CC) $(PROTO_GEN_HEADER)
- 
diff --git a/debian/patches/unapplied/03-set-cmake-deps-openblas.patch b/debian/patches/unapplied/03-set-cmake-deps-openblas.patch
deleted file mode 100644
index eb94eaf..0000000
--- a/debian/patches/unapplied/03-set-cmake-deps-openblas.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cmake/Dependencies.cmake
-+++ b/cmake/Dependencies.cmake
-@@ -67,7 +67,7 @@
- 
- # ---[ BLAS
- if(NOT APPLE)
--  set(BLAS "Atlas" CACHE STRING "Selected BLAS library")
-+  set(BLAS "Open" CACHE STRING "Selected BLAS library")
-   set_property(CACHE BLAS PROPERTY STRINGS "Atlas;Open;MKL")
- 
-   if(BLAS STREQUAL "Atlas" OR BLAS STREQUAL "atlas")
diff --git a/debian/patches/unapplied/04-fix-rpath-issue-in-cmake.patch b/debian/patches/unapplied/04-fix-rpath-issue-in-cmake.patch
deleted file mode 100644
index 23722f4..0000000
--- a/debian/patches/unapplied/04-fix-rpath-issue-in-cmake.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/cmake/Misc.cmake
-+++ b/cmake/Misc.cmake
-@@ -31,6 +31,7 @@
- # ---[ RPATH settings
- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE CACHE BOOLEAN "Use link paths for shared library rpath")
- set(CMAKE_MACOSX_RPATH TRUE)
-+set(CMAKE_SKIP_RPATH   TRUE)
- 
- list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES ${CMAKE_INSTALL_PREFIX}/lib __is_systtem_dir)
- if(${__is_systtem_dir} STREQUAL -1)
diff --git a/debian/patches/unapplied/05-set-cmake-cpuonly.patch b/debian/patches/unapplied/05-set-cmake-cpuonly.patch
deleted file mode 100644
index 689eddd..0000000
--- a/debian/patches/unapplied/05-set-cmake-cpuonly.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -15,7 +15,7 @@
- include(cmake/ConfigGen.cmake)
- 
- # ---[ Options
--caffe_option(CPU_ONLY  "Build Caffe without CUDA support" OFF) # TODO: rename to USE_CUDA
-+caffe_option(CPU_ONLY  "Build Caffe without CUDA support" ON) # TODO: rename to USE_CUDA
- caffe_option(USE_CUDNN "Build Caffe with cuDNN libary support" ON IF NOT CPU_ONLY)
- caffe_option(BUILD_SHARED_LIBS "Build shared libraries" ON)
- caffe_option(BUILD_python "Build Python wrapper" ON)
diff --git a/debian/patches/avoid-cmake-configgen-error.patch b/debian/patches/unapplied/avoid-cmake-configgen-error.patch
similarity index 100%
rename from debian/patches/avoid-cmake-configgen-error.patch
rename to debian/patches/unapplied/avoid-cmake-configgen-error.patch
diff --git a/debian/patches/fix-cmake-add-target-property-version-soversion.patch b/debian/patches/unapplied/fix-cmake-add-target-property-version-soversion.patch
similarity index 100%
rename from debian/patches/fix-cmake-add-target-property-version-soversion.patch
rename to debian/patches/unapplied/fix-cmake-add-target-property-version-soversion.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/caffe.git



More information about the debian-science-commits mailing list