Accepting request 86910 from devel:libraries:c_c++
- update Colpack to new version 1.0.4 * some memory allocation bugfixes OBS-URL: https://build.opensuse.org/request/show/86910 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/adolc?expand=0&rev=10
This commit is contained in:
commit
03fad6d7db
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2911c42ba889afee54fe83eadd7ed534fd3e3c99ef6327fdcd83ea8a6a245f15
|
||||
size 1003059
|
3
ColPack-1.0.4.tar.bz2
Normal file
3
ColPack-1.0.4.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8bddae2c02d8fc78773b2ccc31f94609953b5e83da2b9c98c025928798fb541e
|
||||
size 986735
|
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 6 10:59:00 UTC 2011 - kkhere.geo@gmail.com
|
||||
|
||||
- update Colpack to new version 1.0.4
|
||||
* some memory allocation bugfixes
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 5 12:04:37 UTC 2011 - uli@suse.com
|
||||
|
||||
|
@ -27,8 +27,9 @@ Summary: Algorithmic Differentiation Library for C/C++
|
||||
Url: http://projects.coin-or.org/ADOL-C
|
||||
Group: Development/Languages/C and C++
|
||||
Source: %{name}-%{packver}.tar.bz2
|
||||
Source1: ColPack-1.0.3.tar.bz2
|
||||
Source1: ColPack-1.0.4.tar.bz2
|
||||
Source2: baselibs.conf
|
||||
Patch1: correct-no-return-in-non-void.patch
|
||||
BuildRequires: autoconf automake libtool
|
||||
BuildRequires: gcc-c++ libstdc++-devel
|
||||
# BuildRequires: texlive texlive-latex
|
||||
@ -106,6 +107,9 @@ This package provides the user´s manual for adolc
|
||||
pushd ThirdParty
|
||||
mv %{_builddir}/ColPack/* ColPack/
|
||||
rm -rf %{_builddir}/ColPack
|
||||
pushd ColPack
|
||||
%patch1 -p1
|
||||
popd
|
||||
popd
|
||||
|
||||
%build
|
||||
@ -127,7 +131,7 @@ make %{_smp_mflags}
|
||||
%install
|
||||
%makeinstall
|
||||
install -d %{buildroot}%{_datadir}/doc/packages/%{name}
|
||||
install -m 644 README AUTHORS BUGS LICENSE INSTALL TODO %{buildroot}%{_datadir}/doc/packages/%{name}
|
||||
install -m 644 README AUTHORS BUGS LICENSE TODO %{buildroot}%{_datadir}/doc/packages/%{name}
|
||||
install -m 644 ADOL-C/doc/adolc-manual.pdf %{buildroot}%{_datadir}/doc/packages/%{name}
|
||||
install -m 644 ADOL-C/doc/short_ref.pdf %{buildroot}%{_datadir}/doc/packages/%{name}
|
||||
find "%buildroot" -type f -name "*.la" -delete;
|
||||
|
44
correct-no-return-in-non-void.patch
Normal file
44
correct-no-return-in-non-void.patch
Normal file
@ -0,0 +1,44 @@
|
||||
diff --git a/BipartiteGraphPartialColoring/BipartiteGraphPartialColoring.cpp b/BipartiteGraphPartialColoring/BipartiteGraphPartialColoring.cpp
|
||||
index 81e3c81..8a8f762 100755
|
||||
--- a/BipartiteGraphPartialColoring/BipartiteGraphPartialColoring.cpp
|
||||
+++ b/BipartiteGraphPartialColoring/BipartiteGraphPartialColoring.cpp
|
||||
@@ -564,6 +564,7 @@ namespace ColPack
|
||||
|
||||
}
|
||||
|
||||
+ return ( _TRUE );
|
||||
}
|
||||
|
||||
//Public Function 2456
|
||||
diff --git a/BipartiteGraphPartialColoring/BipartiteGraphPartialOrdering.cpp b/BipartiteGraphPartialColoring/BipartiteGraphPartialOrdering.cpp
|
||||
index f6adb58..b90f5b6 100644
|
||||
--- a/BipartiteGraphPartialColoring/BipartiteGraphPartialOrdering.cpp
|
||||
+++ b/BipartiteGraphPartialColoring/BipartiteGraphPartialOrdering.cpp
|
||||
@@ -537,6 +537,7 @@ namespace ColPack
|
||||
}
|
||||
}
|
||||
cout<<"OUT ROW_SMALLEST_LAST_OMP()"<<endl<<flush;
|
||||
+ return(_TRUE);
|
||||
}
|
||||
|
||||
//Public Function 2359
|
||||
@@ -926,6 +927,7 @@ namespace ColPack
|
||||
}
|
||||
}
|
||||
cout<<"OUT COLUMN_SMALLEST_LAST_OMP()"<<endl<<flush;
|
||||
+ return(_TRUE);
|
||||
}
|
||||
|
||||
|
||||
diff --git a/Utilities/extra.cpp b/Utilities/extra.cpp
|
||||
index 3228b08..078b6a5 100755
|
||||
--- a/Utilities/extra.cpp
|
||||
+++ b/Utilities/extra.cpp
|
||||
@@ -262,6 +262,7 @@ int displayGraph(ColPack::GraphColoring &g) {
|
||||
//command="xdot -f fdp ";
|
||||
command = command + fileName;
|
||||
system(command.c_str());
|
||||
+ return(_TRUE);
|
||||
}
|
||||
|
||||
int buildDotWithoutColor(ColPack::GraphColoring &g, vector<string> &ListOfColors, string fileName) {
|
Loading…
Reference in New Issue
Block a user