[med-svn] [Git][med-team/vg][master] 2 commits: SIMDe patch tweaks

[Michael R. Crusoe]

Michael R. Crusoe pushed to branch master at Debian Med / vg


Commits:
11741cb5 by Michael R. Crusoe at 2020-06-04T13:25:29+02:00
SIMDe patch tweaks

- - - - -
2f9cf74b by Michael R. Crusoe at 2020-06-04T13:25:29+02:00
adjust cleaning

- - - - -


3 changed files:

- debian/clean
- debian/copyright
- debian/rules


Changes:

=====================================
debian/clean
=====================================
@@ -1,5 +1,4 @@
 deps/vowpal_wabbit/vowpalwabbit/.libs/
-deps/DYNAMIC/build/CMakeFiles/
 deps/DYNAMIC/build/*
 deps/gssw/bin/
 deps/gssw/obj/
@@ -13,3 +12,24 @@ deps/libvgio/vg/
 debian/help/vg
 doc/doxygen/
 deps/xg/xg.o
+deps/sublinear-Li-Stephens/lib/
+deps/sublinear-Li-Stephens/obj/
+deps/vowpal_wabbit/cluster/.libs/
+deps/vowpal_wabbit/cluster/*.o
+deps/vowpal_wabbit/library/*.o
+deps/vowpal_wabbit/vowpalwabbit/*.o
+bin/shuf
+deps/libhandlegraph/CMakeCache.txt
+deps/libhandlegraph/Makefile
+deps/libhandlegraph/cmake_install.cmake
+deps/progress_bar/*.d
+deps/sdsl-lite/Make.helper
+deps/sdsl-lite/lib/structure_tree.cpp
+deps/sdsl-lite/test/compile_test.cpp
+deps/sonLib/C/*.d
+deps/vowpal_wabbit/config.log
+deps/vowpal_wabbit/config.status
+deps/vowpal_wabbit/libtool
+deps/vowpal_wabbit/libvw.pc
+deps/vowpal_wabbit/vowpalwabbit/config.h
+deps/vowpal_wabbit/vowpalwabbit/stamp-h1


=====================================
debian/copyright
=====================================
@@ -12,10 +12,14 @@ Files-Excluded: deps/libdeflate
                 deps/ssw
                 deps/sonLib/externalTools/quicktree_1.1/include/buildtree.h~
                 deps/vowpal_wabbit/rapidjson
+                deps/vowpal_wabbit/cluster/Makefile
                 deps/vowpal_wabbit/vowpalwabbit/win32
                 deps/vowpal_wabbit/vowpalwabbit/.nuget
                 deps/vowpal_wabbit/demo
                 deps/vowpal_wabbit/utl
+                deps/vowpal_wabbit/Makefile
+                deps/vowpal_wabbit/library/Makefile
+                deps/vowpal_wabbit/vowpalwabbit/Makefile
                 deps/fermi-lite
                 deps/fastahack
                 deps/libVCFH


=====================================
debian/rules
=====================================
@@ -21,6 +21,11 @@ libexecdir=$(prefix)/lib/$(DEB_SOURCE)
 override_dh_autoreconf:
 	dh_autoreconf --sourcedirectory=$(CURDIR)/deps/vowpal_wabbit
 
+
+override_dh_clean:
+	rm -Rf ./deps/DYNAMIC/build/CMakeFiles
+	dh_clean
+
 override_dh_auto_clean:
 	mv include/vg_git_version.hpp debian/
 	rm -Rf include/*
@@ -38,7 +43,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386))
 		dh_auto_build -- SFX=-$${SIMD} all test/build_graph bin/shuf ; \
 	done
 	CXXFLAGS="$(CXXFLAGS)" CFLAGS="$(CFLAGS)" dh_auto_build -- SFX=-plain all test/build_graph bin/shuf
-	cp bin/vg-plain debian/help/vg
+	cp bin/vg-avx2 debian/help/vg
 ifeq (i386,$(DEB_HOST_ARCH))
 	for SIMD in sse2 sse ; do \
 		export CXXFLAGS="$(CXXFLAGS) -m$${SIMD}" && export CFLAGS="$(CFLAGS) -m$${SIMD}" && \
@@ -56,8 +61,15 @@ endif
 
 override_dh_auto_test-arch:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386))
+	set +e ; for BIN in bin/vg-* ; do \
+	  echo Testing $${BIN} && cp $${BIN} debian/help/vg && \
+	  export PATH=$$PATH:$(CURDIR)/debian/help && . ./source_me.sh && cd test && prove -v t ; \
+	done ; set -e
+else
 	export PATH=$$PATH:$(CURDIR)/debian/help && . ./source_me.sh && cd test && prove -v t
 endif
+endif
 
 override_dh_auto_test-indep:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))



View it on GitLab: https://salsa.debian.org/med-team/vg/-/compare/05bd88dce1670547713953056516251b69fa2ebb...2f9cf74b81c2f5c969d111a7772bab8b81804660

-- 
View it on GitLab: https://salsa.debian.org/med-team/vg/-/compare/05bd88dce1670547713953056516251b69fa2ebb...2f9cf74b81c2f5c969d111a7772bab8b81804660
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20200604/443d3d3f/attachment-0001.html>