badshah400/armadillo
SHA256
1
0
Fork 0
forked from pool/armadillo
Code Pull Requests Activity

Accepting request 494999 from home:badshah400:branches:devel:libraries:c_c++

Browse Source 
Update to v7.900.1

OBS-URL: https://build.opensuse.org/request/show/494999
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/armadillo?expand=0&rev=209
This commit is contained in:
Ismail Dönmez 2017-05-15 18:39:40 +00:00 committed by Git OBS Bridge
parent 9a1af7faab
commit d997c20470
5 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
armadillo-7.800.0.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ba56fb7b31c77d7ecd41334243d8a45d51e7559f76f6371783c17a72432dd486
size 4000172

3
armadillo-7.900.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:33eec7013990b5477ccc5ad3abc68bc2326c7a7a2790014d625cfcf37c0e07d3
size 4022388

21
armadillo-tests.patch
View File

@ -1,7 +1,7 @@
Index: armadillo-7.500.0/tests/Makefile.in Index: armadillo-7.900.1/tests/Makefile.in
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ armadillo-7.500.0/tests/Makefile.in +++ armadillo-7.900.1/tests/Makefile.in
@@ -0,0 +1,38 @@ @@ -0,0 +1,38 @@
+ +
+LIB_FLAGS = -L@PROJECT_SOURCE_DIR@ -larmadillo +LIB_FLAGS = -L@PROJECT_SOURCE_DIR@ -larmadillo
@ -41,11 +41,11 @@ Index: armadillo-7.500.0/tests/Makefile.in
+ +
+clean: +clean:
+ rm -f main *.o + rm -f main *.o
Index: armadillo-7.500.0/CMakeLists.txt Index: armadillo-7.900.1/CMakeLists.txt
=================================================================== ===================================================================
--- armadillo-7.500.0.orig/CMakeLists.txt --- armadillo-7.900.1.orig/CMakeLists.txt
+++ armadillo-7.500.0/CMakeLists.txt +++ armadillo-7.900.1/CMakeLists.txt
@@ -453,6 +453,10 @@ set(ARMADILLO_LIB_DIR "${PROJECT_BI @@ -437,6 +437,10 @@ set(ARMADILLO_LIB_DIR "${PROJECT_BI
set(ARMADILLO_CMAKE_DIR "${PROJECT_BINARY_DIR}") set(ARMADILLO_CMAKE_DIR "${PROJECT_BINARY_DIR}")
@ -56,17 +56,18 @@ Index: armadillo-7.500.0/CMakeLists.txt
message(STATUS "Generating '${PROJECT_BINARY_DIR}/ArmadilloConfig.cmake'") message(STATUS "Generating '${PROJECT_BINARY_DIR}/ArmadilloConfig.cmake'")
# copy/change config and configVersion file (modify only the @xyz@ variables) # copy/change config and configVersion file (modify only the @xyz@ variables)
configure_file(${PROJECT_SOURCE_DIR}/cmake_aux/InstallFiles/ArmadilloConfig.cmake.in configure_file(${PROJECT_SOURCE_DIR}/cmake_aux/InstallFiles/ArmadilloConfig.cmake.in
Index: armadillo-7.500.0/tests/Makefile Index: armadillo-7.900.1/tests/Makefile
=================================================================== ===================================================================
--- armadillo-7.500.0.orig/tests/Makefile --- armadillo-7.900.1.orig/tests/Makefile
+++ /dev/null +++ armadillo-7.900.1/tests/Makefile
@@ -1,24 +0,0 @@ @@ -1,25 +0,0 @@
- -
-LIB_FLAGS = -larmadillo -LIB_FLAGS = -larmadillo
-#LIB_FLAGS = -lblas -llapack -#LIB_FLAGS = -lblas -llapack
-#LIB_FLAGS = -lopenblas -llapack -#LIB_FLAGS = -lopenblas -llapack
- -
-CXX_FLAGS = -std=c++11 -Wshadow -Wall -pedantic -O0 -CXX_FLAGS = -std=c++11 -Wshadow -Wall -pedantic -O0
-#CXX_FLAGS = -std=c++11 -Wshadow -Wall -pedantic -O0 -fopenmp
-#CXX_FLAGS = -std=c++11 -Wshadow -Wall -pedantic -O0 -DARMA_DONT_USE_WRAPPER -#CXX_FLAGS = -std=c++11 -Wshadow -Wall -pedantic -O0 -DARMA_DONT_USE_WRAPPER
-#CXX_FLAGS = -std=c++11 -Wshadow -Wall -pedantic -O2 -#CXX_FLAGS = -std=c++11 -Wshadow -Wall -pedantic -O2
- -

13
armadillo.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Mon May 15 14:07:43 UTC 2017 - badshah400@gmail.com
- Update to version 7.900.1:
+ Expanded clamp() to handle cubes.
+ Computationally expensive element-wise functions (such as
exp(), log(), cos(), etc) can now be automatically sped up via
OpenMP; this requires a C++11/C++14 compiler with OpenMP 3.0+
support.
- Rebase armadillo-tests.patch for updated version.
- Drop tests because upstream acknowledges some tests are intended
to fail without ARPACK.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Feb 18 22:37:01 UTC 2017 - badshah400@gmail.com Sat Feb 18 22:37:01 UTC 2017 - badshah400@gmail.com

15
armadillo.spec
View File

@ -18,7 +18,7 @@
%define soname libarmadillo7 %define soname libarmadillo7
Name: armadillo Name: armadillo
Version: 7.800.0 Version: 7.900.1
Release: 0 Release: 0
Summary: Fast C++ matrix library with interfaces to LAPACK and ATLAS Summary: Fast C++ matrix library with interfaces to LAPACK and ATLAS
License: Apache-2.0 License: Apache-2.0
@ -140,7 +140,7 @@ for i in `ls examples/*.cpp`; do sed -i 's/\r//' $i; done
%build %build
cmake . \ cmake . \
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix}\ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix}\
-DINSTALL_LIB_DIR:PATH=%{_libdir} -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir}
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
@ -150,11 +150,12 @@ rm -rf examples/example1_win64.*
rm -rf examples/example2_win64.* rm -rf examples/example2_win64.*
rm -rf examples/lib_win64 rm -rf examples/lib_win64
%check # Drop tests because upstream acknowledges some tests are intended to fail without ARPACK
pushd tests #%%check
make %{?_smp_mflags} #pushd tests
./main #make %%{?_smp_mflags}
popd #./main
#popd
%post -n %{soname} -p /sbin/ldconfig %post -n %{soname} -p /sbin/ldconfig