[caffe-contrib] 268/362: install: using libcaffe-dev.install.in

Zhou Mo cdluminate-guest at moszumanska.debian.org
Tue May 3 09:24:42 UTC 2016


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

cdluminate-guest pushed a commit to branch master
in repository caffe-contrib.

commit 2431f71155285bd05ba7d3b6e20bcf9decf19ce1
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Wed Mar 9 05:29:47 2016 +0000

    install: using libcaffe-dev.install.in
---
 debian/libcaffe-cpu-dev.install  | 39 ---------------------------------------
 debian/libcaffe-cuda-dev.install | 39 ---------------------------------------
 debian/libcaffe-dev.install.in   | 38 ++++++++++++++++++++++++++++++++++++++
 debian/rules                     |  4 ++++
 4 files changed, 42 insertions(+), 78 deletions(-)

diff --git a/debian/libcaffe-cpu-dev.install b/debian/libcaffe-cpu-dev.install
deleted file mode 100644
index 1837d70..0000000
--- a/debian/libcaffe-cpu-dev.install
+++ /dev/null
@@ -1,39 +0,0 @@
-debian/tmp/caffe_cpu/include/caffe/python_layer.hpp                  usr/include/caffe/ 
-debian/tmp/caffe_cpu/include/caffe/internal_thread.hpp               usr/include/caffe/ 
-debian/tmp/caffe_cpu/include/caffe/layer.hpp                         usr/include/caffe/ 
-debian/tmp/caffe_cpu/include/caffe/data_transformer.hpp              usr/include/caffe/ 
-debian/tmp/caffe_cpu/include/caffe/util/io.hpp                       usr/include/caffe/util/ 
-debian/tmp/caffe_cpu/include/caffe/util/math_functions.hpp           usr/include/caffe/util/ 
-debian/tmp/caffe_cpu/include/caffe/util/insert_splits.hpp            usr/include/caffe/util/ 
-debian/tmp/caffe_cpu/include/caffe/util/device_alternate.hpp         usr/include/caffe/util/ 
-debian/tmp/caffe_cpu/include/caffe/util/cudnn.hpp                    usr/include/caffe/util/ 
-debian/tmp/caffe_cpu/include/caffe/util/db.hpp                       usr/include/caffe/util/ 
-debian/tmp/caffe_cpu/include/caffe/util/rng.hpp                      usr/include/caffe/util/ 
-debian/tmp/caffe_cpu/include/caffe/util/db_leveldb.hpp               usr/include/caffe/util/ 
-debian/tmp/caffe_cpu/include/caffe/util/benchmark.hpp                usr/include/caffe/util/ 
-debian/tmp/caffe_cpu/include/caffe/util/db_lmdb.hpp                  usr/include/caffe/util/ 
-debian/tmp/caffe_cpu/include/caffe/util/mkl_alternate.hpp            usr/include/caffe/util/ 
-debian/tmp/caffe_cpu/include/caffe/util/im2col.hpp                   usr/include/caffe/util/ 
-debian/tmp/caffe_cpu/include/caffe/util/upgrade_proto.hpp            usr/include/caffe/util/ 
-debian/tmp/caffe_cpu/include/caffe/test/test_caffe_main.hpp          usr/include/caffe/test/
-debian/tmp/caffe_cpu/include/caffe/test/test_gradient_check_util.hpp usr/include/caffe/test/
-debian/tmp/caffe_cpu/include/caffe/caffe.hpp                         usr/include/caffe/ 
-debian/tmp/caffe_cpu/include/caffe/solver.hpp                        usr/include/caffe/ 
-debian/tmp/caffe_cpu/include/caffe/net.hpp                           usr/include/caffe/ 
-debian/tmp/caffe_cpu/include/caffe/loss_layers.hpp                   usr/include/caffe/ 
-debian/tmp/caffe_cpu/include/caffe/neuron_layers.hpp                 usr/include/caffe/ 
-debian/tmp/caffe_cpu/include/caffe/layer_factory.hpp                 usr/include/caffe/ 
-debian/tmp/caffe_cpu/include/caffe/filler.hpp                        usr/include/caffe/ 
-debian/tmp/caffe_cpu/include/caffe/blob.hpp                          usr/include/caffe/ 
-debian/tmp/caffe_cpu/include/caffe/data_layers.hpp                   usr/include/caffe/ 
-debian/tmp/caffe_cpu/include/caffe/vision_layers.hpp                 usr/include/caffe/ 
-debian/tmp/caffe_cpu/include/caffe/proto                             usr/include/caffe/ 
-debian/tmp/caffe_cpu/include/caffe/proto/caffe.pb.h                  usr/include/caffe/ 
-debian/tmp/caffe_cpu/include/caffe/common.hpp                        usr/include/caffe/ 
-debian/tmp/caffe_cpu/include/caffe/common_layers.hpp                 usr/include/caffe/ 
-debian/tmp/caffe_cpu/include/caffe/syncedmem.hpp                     usr/include/caffe/ 
-debian/tmp/caffe_cpu/lib/libproto.a                                  usr/lib/caffe-cpu/    
-
-debian/tmp/caffe_cpu/share/Caffe/CaffeTargets.cmake                  usr/share/caffe-cpu/
-debian/tmp/caffe_cpu/share/Caffe/CaffeTargets-release.cmake          usr/share/caffe-cpu/  
-debian/tmp/caffe_cpu/share/Caffe/CaffeConfig.cmake                   usr/share/caffe-cpu/
diff --git a/debian/libcaffe-cuda-dev.install b/debian/libcaffe-cuda-dev.install
deleted file mode 100644
index 1f553e3..0000000
--- a/debian/libcaffe-cuda-dev.install
+++ /dev/null
@@ -1,39 +0,0 @@
-debian/tmp/caffe_cuda/include/caffe/python_layer.hpp                  usr/include/caffe/    
-debian/tmp/caffe_cuda/include/caffe/internal_thread.hpp               usr/include/caffe/    
-debian/tmp/caffe_cuda/include/caffe/layer.hpp                         usr/include/caffe/    
-debian/tmp/caffe_cuda/include/caffe/data_transformer.hpp              usr/include/caffe/    
-debian/tmp/caffe_cuda/include/caffe/util/io.hpp                       usr/include/caffe/util/    
-debian/tmp/caffe_cuda/include/caffe/util/math_functions.hpp           usr/include/caffe/util/    
-debian/tmp/caffe_cuda/include/caffe/util/insert_splits.hpp            usr/include/caffe/util/    
-debian/tmp/caffe_cuda/include/caffe/util/device_alternate.hpp         usr/include/caffe/util/    
-debian/tmp/caffe_cuda/include/caffe/util/cudnn.hpp                    usr/include/caffe/util/    
-debian/tmp/caffe_cuda/include/caffe/util/db.hpp                       usr/include/caffe/util/    
-debian/tmp/caffe_cuda/include/caffe/util/rng.hpp                      usr/include/caffe/util/    
-debian/tmp/caffe_cuda/include/caffe/util/db_leveldb.hpp               usr/include/caffe/util/    
-debian/tmp/caffe_cuda/include/caffe/util/benchmark.hpp                usr/include/caffe/util/    
-debian/tmp/caffe_cuda/include/caffe/util/db_lmdb.hpp                  usr/include/caffe/util/    
-debian/tmp/caffe_cuda/include/caffe/util/mkl_alternate.hpp            usr/include/caffe/util/    
-debian/tmp/caffe_cuda/include/caffe/util/im2col.hpp                   usr/include/caffe/util/    
-debian/tmp/caffe_cuda/include/caffe/util/upgrade_proto.hpp            usr/include/caffe/util/    
-debian/tmp/caffe_cuda/include/caffe/test/test_caffe_main.hpp          usr/include/caffe/test/    
-debian/tmp/caffe_cuda/include/caffe/test/test_gradient_check_util.hpp usr/include/caffe/test/    
-debian/tmp/caffe_cuda/include/caffe/caffe.hpp                         usr/include/caffe/    
-debian/tmp/caffe_cuda/include/caffe/solver.hpp                        usr/include/caffe/    
-debian/tmp/caffe_cuda/include/caffe/net.hpp                           usr/include/caffe/    
-debian/tmp/caffe_cuda/include/caffe/loss_layers.hpp                   usr/include/caffe/    
-debian/tmp/caffe_cuda/include/caffe/neuron_layers.hpp                 usr/include/caffe/    
-debian/tmp/caffe_cuda/include/caffe/layer_factory.hpp                 usr/include/caffe/    
-debian/tmp/caffe_cuda/include/caffe/filler.hpp                        usr/include/caffe/    
-debian/tmp/caffe_cuda/include/caffe/blob.hpp                          usr/include/caffe/    
-debian/tmp/caffe_cuda/include/caffe/data_layers.hpp                   usr/include/caffe/    
-debian/tmp/caffe_cuda/include/caffe/vision_layers.hpp                 usr/include/caffe/    
-debian/tmp/caffe_cuda/include/caffe/proto                             usr/include/caffe/    
-debian/tmp/caffe_cuda/include/caffe/proto/caffe.pb.h                  usr/include/caffe/    
-debian/tmp/caffe_cuda/include/caffe/common.hpp                        usr/include/caffe/    
-debian/tmp/caffe_cuda/include/caffe/common_layers.hpp                 usr/include/caffe/    
-debian/tmp/caffe_cuda/include/caffe/syncedmem.hpp                     usr/include/caffe/    
-debian/tmp/caffe_cuda/lib/libproto.a                                  usr/lib/caffe-cuda/
-
-debian/tmp/caffe_cuda/share/Caffe/CaffeTargets.cmake                  usr/share/caffe-cuda/
-debian/tmp/caffe_cuda/share/Caffe/CaffeTargets-release.cmake          usr/share/caffe-cuda/
-debian/tmp/caffe_cuda/share/Caffe/CaffeConfig.cmake                   usr/share/caffe-cuda/
diff --git a/debian/libcaffe-dev.install.in b/debian/libcaffe-dev.install.in
new file mode 100644
index 0000000..5fcf5e7
--- /dev/null
+++ b/debian/libcaffe-dev.install.in
@@ -0,0 +1,38 @@
+debian/tmp/#CAFFE_CONFIGURE#/include/caffe/python_layer.hpp                  usr/include/caffe/
+debian/tmp/#CAFFE_CONFIGURE#/include/caffe/internal_thread.hpp               usr/include/caffe/
+debian/tmp/#CAFFE_CONFIGURE#/include/caffe/layer.hpp                         usr/include/caffe/
+debian/tmp/#CAFFE_CONFIGURE#/include/caffe/data_transformer.hpp              usr/include/caffe/
+debian/tmp/#CAFFE_CONFIGURE#/include/caffe/util/io.hpp                       usr/include/caffe/util/
+debian/tmp/#CAFFE_CONFIGURE#/include/caffe/util/math_functions.hpp           usr/include/caffe/util/
+debian/tmp/#CAFFE_CONFIGURE#/include/caffe/util/insert_splits.hpp            usr/include/caffe/util/
+debian/tmp/#CAFFE_CONFIGURE#/include/caffe/util/device_alternate.hpp         usr/include/caffe/util/
+debian/tmp/#CAFFE_CONFIGURE#/include/caffe/util/cudnn.hpp                    usr/include/caffe/util/
+debian/tmp/#CAFFE_CONFIGURE#/include/caffe/util/db.hpp                       usr/include/caffe/util/
+debian/tmp/#CAFFE_CONFIGURE#/include/caffe/util/rng.hpp                      usr/include/caffe/util/
+debian/tmp/#CAFFE_CONFIGURE#/include/caffe/util/db_leveldb.hpp               usr/include/caffe/util/
+debian/tmp/#CAFFE_CONFIGURE#/include/caffe/util/benchmark.hpp                usr/include/caffe/util/
+debian/tmp/#CAFFE_CONFIGURE#/include/caffe/util/db_lmdb.hpp                  usr/include/caffe/util/
+debian/tmp/#CAFFE_CONFIGURE#/include/caffe/util/mkl_alternate.hpp            usr/include/caffe/util/
+debian/tmp/#CAFFE_CONFIGURE#/include/caffe/util/im2col.hpp                   usr/include/caffe/util/
+debian/tmp/#CAFFE_CONFIGURE#/include/caffe/util/upgrade_proto.hpp            usr/include/caffe/util/
+debian/tmp/#CAFFE_CONFIGURE#/include/caffe/test/test_caffe_main.hpp          usr/include/caffe/test/
+debian/tmp/#CAFFE_CONFIGURE#/include/caffe/test/test_gradient_check_util.hpp usr/include/caffe/test/
+debian/tmp/#CAFFE_CONFIGURE#/include/caffe/caffe.hpp                         usr/include/caffe/
+debian/tmp/#CAFFE_CONFIGURE#/include/caffe/solver.hpp                        usr/include/caffe/
+debian/tmp/#CAFFE_CONFIGURE#/include/caffe/net.hpp                           usr/include/caffe/
+debian/tmp/#CAFFE_CONFIGURE#/include/caffe/loss_layers.hpp                   usr/include/caffe/
+debian/tmp/#CAFFE_CONFIGURE#/include/caffe/neuron_layers.hpp                 usr/include/caffe/
+debian/tmp/#CAFFE_CONFIGURE#/include/caffe/layer_factory.hpp                 usr/include/caffe/
+debian/tmp/#CAFFE_CONFIGURE#/include/caffe/filler.hpp                        usr/include/caffe/
+debian/tmp/#CAFFE_CONFIGURE#/include/caffe/blob.hpp                          usr/include/caffe/
+debian/tmp/#CAFFE_CONFIGURE#/include/caffe/data_layers.hpp                   usr/include/caffe/
+debian/tmp/#CAFFE_CONFIGURE#/include/caffe/vision_layers.hpp                 usr/include/caffe/
+debian/tmp/#CAFFE_CONFIGURE#/include/caffe/proto                             usr/include/caffe/
+debian/tmp/#CAFFE_CONFIGURE#/include/caffe/proto/caffe.pb.h                  usr/include/caffe/
+debian/tmp/#CAFFE_CONFIGURE#/include/caffe/common.hpp                        usr/include/caffe/
+debian/tmp/#CAFFE_CONFIGURE#/include/caffe/common_layers.hpp                 usr/include/caffe/
+debian/tmp/#CAFFE_CONFIGURE#/include/caffe/syncedmem.hpp                     usr/include/caffe/
+debian/tmp/#CAFFE_CONFIGURE#/lib/libproto.a                                  usr/lib/caffe-cpu/
+debian/tmp/#CAFFE_CONFIGURE#/share/Caffe/CaffeTargets.cmake                  usr/share/caffe-cpu/
+debian/tmp/#CAFFE_CONFIGURE#/share/Caffe/CaffeTargets-release.cmake          usr/share/caffe-cpu/
+debian/tmp/#CAFFE_CONFIGURE#/share/Caffe/CaffeConfig.cmake                   usr/share/caffe-cpu/
diff --git a/debian/rules b/debian/rules
index 6366222..7242b5a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,6 +75,10 @@ autogen:
 	perl -p -e "s{#CAFFE_CONFIGURE#}{caffe_cuda}g;" \
 		-e 's{#CAFFE_SOVER#}{$(CAFFE_SOVER)}g;' \
 		< libcaffe.install.in > libcaffe-cuda0.install
+	perl -p -e 's{#CAFFE_CONFIGURE#}{caffe_cpu}g;' \
+		< libcaffe-dev.install.in > libcaffe-cpu-dev.install
+	perl -p -e 's{#CAFFE_CONFIGURE#}{caffe_cuda}g;' \
+		< libcaffe-dev.install.in > libcaffe-cuda-dev.install
 
 override_dh_auto_configure:
 	dh_auto_configure \

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



More information about the debian-science-commits mailing list