Bug#1055857: patch still valid? (opm-common: test failure on ppc64el with -O3)

2024-04-02 Thread Markus Blatt 

Hi,

Concerning the patch: It seems like -O2 is the default in Debian now anyway.
Will the patch still work as it is?

I did some investigations on platti.debian.org. I have no idea what the problem
is. My hunch is that compiler optimization breaks the code here. If I add a
simple print statement like this then the test passes:

(sid_ppc64el-dchroot)blattms@platti:~/opm-common$ git diff  
opm/output/data/InterRegFlow.hpp
diff --git a/opm/output/data/InterRegFlow.hpp b/opm/output/data/InterRegFlow.hpp
index 0e1dadcc4..7e2aeabbe 100644
--- a/opm/output/data/InterRegFlow.hpp
+++ b/opm/output/data/InterRegFlow.hpp
@@ -29,7 +29,7 @@
 #include 
 #include 
 #include 
-
+#include 
 namespace Opm { namespace data {
 
 /// Intermediary Protocol to Linearise Per-Connection Flow Rates Into Subrange.

@@ -271,7 +271,7 @@ namespace Opm { namespace data {
 using sz_t = decltype(InterRegFlow::bufferSize());
 
 const auto& [begin, end] = this->elements_;

-
+std::cout<<"distance=";//<<  std::distance(begin, end);// << " size="<< 
InterRegFlow::bufferSize()<(std::distance(begin, end))
 == InterRegFlow::bufferSize();
 }
(sid_ppc64el-dchroot)blattms@platti:~/opm-common$ 


Best,

Markus

Bug#1055857: transition: opm-common

2023-11-26 Thread Markus Blatt 

Hi,

Am Thu, Nov 23, 2023 at 09:32:31AM +0100 schrieb Sebastian Ramacher:


On 2023-11-12 21:42:20 +0100, Markus Blatt wrote:


Dear Debian release team,

A new upstream release of OPM is available. To ease migration to testing I am
requesting a mini-transition. Uploading to unstable would probably work even
without a transition, but I would like to play it safe.

This should only affect the OPM source packages opm-common, opm-grid, opm-
models, opm-simulators and opm-upscaling.

I have already uploaded new versions to experimental that seemed to have built
without any issues, see [1].
(please explain about the transition: impacted packages, reason, ...
 for more info see: https://wiki.debian.org/Teams/ReleaseTeam/Transitions)

Ben file:

title = "libopm-common-2023";
is_affected = .depends ~ "libopm-common-2023.04" | .depends ~ "libopm-
common-2023.10";
is_good = .depends ~ "libopm-common-2023.10";
is_bad = .depends ~ "libopm-common-2023.04";


libopm-common has a Provides: libopm-common-X, but the shared library
included in libopm-common also has a SONAME of libopm-common.X. Why is
the packaging not following the common practice of matching the package
name with the SONAME?



Thanks a lot for noticing.

Indeed the library has an SONAME, but as upstream does not care about API
changes, one cannot rely on them. Basically the SONAME is changed 
with every release. Releases happen twice a year in April/October. Hence

we have 2022.04, 2022.10, 2023.04, 2023.10, etc. The problem probably is
that there is no compatibility between 2023.04 and 2023.10. If we would do
intermediate snapshot releases, then those might have slightly incompatibe APIs,
too.

The reason for the current situation probably is a combination of lack of
knowledge on my side and inspiration taken from libdune-common-dev. I now
realise that the situation is different here, though.

Solving the SONAME issue might require quite some additional work. We would need
to start with 2024.0 now and increase the major number with every release. If
we do this only in Debian then those numbers would also differ from upstream,
which might be a problem.

What would your suggestion be?

Cheers,

Markus

Bug#1055857: transition: opm-common

2023-11-12 Thread Markus Blatt 
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: transition
X-Debbugs-Cc: debian-scie...@lists.debian.org

Dear Debian release team,

A new upstream release of OPM is available. To ease migration to testing I am
requesting a mini-transition. Uploading to unstable would probably work even
without a transition, but I would like to play it safe.

This should only affect the OPM source packages opm-common, opm-grid, opm-
models, opm-simulators and opm-upscaling.

I have already uploaded new versions to experimental that seemed to have built
without any issues, see [1].
(please explain about the transition: impacted packages, reason, ...
 for more info see: https://wiki.debian.org/Teams/ReleaseTeam/Transitions)

Ben file:

title = "libopm-common-2023";
is_affected = .depends ~ "libopm-common-2023.04" | .depends ~ "libopm-
common-2023.10";
is_good = .depends ~ "libopm-common-2023.10";
is_bad = .depends ~ "libopm-common-2023.04";

Thanks a lot.

Kind regards,

Markus

[1] https://qa.debian.org/developer.php?login=markus%40dr-blatt.de

Bug#1034380: unblock: opm-models/2022.10+ds-4

2023-04-17 Thread Markus Blatt 

Hi Paul,

Am Sun, Apr 16, 2023 at 10:03:07PM +0200 schrieb Paul Gevers:


On 13-04-2023 22:56, Markus Blatt wrote:

None, because no real code is changed


Can you elaborate why this is needed? I confirm I see nothing of interest.



you are right, there are no real changes in here.

The only changes are:
- Bump to 4.6.2 standard
- Limit architectures for running tests. (That was my failed attempt to
  convince britney that the autopkgtests have run)

I am perfectly fine with keeping this blocked and closing the bug.

Best,

Markus


signature.asc
Description: PGP signature

Bug#1034382: unblock: opm-upscaling/2022.10+ds-4

2023-04-13 Thread Markus Blatt 
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package opm-upscaling

[ Reason ]
Package contains fixes to d/*control files, unneeded code is not compiled
anymore (backport from upstream). Package is blocked only because britney
thinks that not all autopkgtests have run, but those for official architectures
with binaries have run

[ Impact ]
No impact on user if this is not unblocked.

[ Tests ]
All autopkgtests for architectures with binaries have run

[ Risks ]
None, because no real code is changed

[ Checklist ]
  [X] all changes are documented in the d/changelog
  [X] I reviewed all changes and I approve them
  [X] attach debdiff against the package in testing

[ Other info ]
None


unblock opm-upscaling/2022.10+ds-4
diff --git a/debian/changelog b/debian/changelog
index 6cc7b59..abc63b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+opm-upscaling (2022.10+ds-4) unstable; urgency=medium
+
+  * Removed stale static benchmarks to really not need git.
+
+ -- Markus Blatt   Thu, 09 Mar 2023 13:36:31 +0100
+
+opm-upscaling (2022.10+ds-3) unstable; urgency=medium
+
+  * d/control: Remove git from Build-Depends as it is not needed.
+
+ -- Markus Blatt   Thu, 09 Mar 2023 00:01:19 +0100
+
+opm-upscaling (2022.10+ds-2) experimental; urgency=medium
+
+  * d/control: Bumped standards version to 4.6.2 (no-change)
+
+ -- Markus Blatt   Mon, 09 Jan 2023 16:57:02 +0100
+
 opm-upscaling (2022.10+ds-1) unstable; urgency=medium
 
   * New upstream version 2022.10
diff --git a/debian/control b/debian/control
index 8fd5433..7226645 100644
--- a/debian/control
+++ b/debian/control
@@ -6,10 +6,10 @@ Build-Depends: debhelper-compat (= 12), cmake (>=3.10), quilt,
libboost-system-dev, libboost-date-time-dev, libboost-test-dev,
libboost-iostreams-dev,
gfortran, libtinyxml-dev, bc,
-   git, zlib1g-dev, libtool, libopm-material-dev (>= 2022.10), 
libopm-grid-dev (>= 2022.10),
+   zlib1g-dev, libtool, libopm-material-dev (>= 2022.10), 
libopm-grid-dev (>= 2022.10),
doxygen, texlive-latex-extra, texlive-latex-recommended, 
ghostscript,
pkg-config, mpi-default-dev, mpi-default-bin
-Standards-Version: 4.6.0
+Standards-Version: 4.6.2
 Section: libs
 Homepage: http://opm-project.org
 Vcs-Browser: https://salsa.debian.org/science-team/opm-upscaling
diff --git 
a/debian/patches/0001-Removed-stale-static-benchmarks-to-really-not-need-g.patch
 
b/debian/patches/0001-Removed-stale-static-benchmarks-to-really-not-need-g.patch
new file mode 100644
index 000..a87c4b3
--- /dev/null
+++ 
b/debian/patches/0001-Removed-stale-static-benchmarks-to-really-not-need-g.patch
@@ -0,0 +1,35 @@
+From: Markus Blatt 
+Date: Thu, 9 Mar 2023 09:40:37 +0100
+Subject: Removed stale static benchmarks to really not need git.
+
+According to upstream those are from ancient time, not used and built,
+anyway.
+---
+ CMakeLists.txt | 15 ---
+ 1 file changed, 15 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0ea55dd..f4f68c6 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -112,20 +112,5 @@ include 
(${CMAKE_CURRENT_SOURCE_DIR}/compareUpscaling.cmake)
+ # encode test cases so they can be embedded in the benchmark executables
+ include (${PROJECT_SOURCE_DIR}/EmbedCases.cmake)
+ 
+-# Setup static benchmarks
+-include(OpmStaticTargets)
+-opm_from_git(${PROJECT_SOURCE_DIR} benchmarks ${VCS_SHA1} benchmarks)
+-add_dependencies(benchmarks-static opm-grid-static)
+-
+-# Copy static benchmarks to main project binary directory
+-foreach(benchmark ${OPM_BENCHMARKS})
+-  add_custom_command(TARGET benchmarks-static POST_BUILD
+- COMMAND ${CMAKE_COMMAND} -E copy 
${CMAKE_BINARY_DIR}/static/benchmarks/src/benchmarks-static-build/bin/${benchmark}
+-  
${CMAKE_BINARY_DIR}/bin/${benchmark}-static)
+-  if(INSTALL_BENCHMARKS)
+-  install(TARGETS ${benchmark} DESTINATION bin)
+-  endif()
+-endforeach()
+-
+ install(DIRECTORY doc/man1 DESTINATION ${CMAKE_INSTALL_MANDIR}
+   FILES_MATCHING PATTERN "*.1")
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000..0197cdd
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Removed-stale-static-benchmarks-to-really-not-need-g.patch

Bug#1034381: unblock: opm-simulators/2022.10+ds-2

2023-04-13 Thread Markus Blatt 
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package opm-simulators

[ Reason ]
Package contains fixes to d/*control and d/rules files (might ease rebuilds)
and fixes the version string of the programs. Is blocked only because britney
thinks that not all autopkgtests have run, but those for official architectures
with binaries have run

[ Impact ]
Slight impact on the user if he/she build software based on opm-simulators.
Without the new version there might be issues when using alberta

[ Tests ]
All autopkgtests for architectures with binaries have run

[ Risks ]
Small, because not much code is changed

[ Checklist ]
  [X] all changes are documented in the d/changelog
  [X] I reviewed all changes and I approve them
  [X] attach debdiff against the package in testing

[ Other info ]
None

unblock opm-simulators/2022.10+ds-2
diff --git a/debian/changelog b/debian/changelog
index 1d514e256..df8054d61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+opm-simulators (2022.10+ds-2) unstable; urgency=medium
+
+  * d/rules: Require 4GB of RAM per make process
+  * [cmake]  Work around missing imported Alberta targets.
+  * d/control: Fixed version string used in binaries.
+
+ -- Markus Blatt   Thu, 09 Mar 2023 13:31:04 +0100
+
 opm-simulators (2022.10+ds-1) unstable; urgency=medium
 
   * New upstream version 2022.10
diff --git a/debian/control b/debian/control
index 50cb90194..eb74c3c7c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Maintainer: Debian Science Maintainers 
, Markus Blatt 

 Build-Depends: debhelper-compat (= 12), cmake (>=3.10), quilt, dh-python,
libboost-system-dev, libboost-date-time-dev, libboost-test-dev,
-   zlib1g-dev, gfortran, pkg-config, git, libtool, doxygen,
+   zlib1g-dev, gfortran, pkg-config, lsb-release, libtool, doxygen,
texlive-latex-extra, texlive-latex-recommended, ghostscript,
libopm-grid-dev (>= 2022.10), libopm-models-dev (>= 2022.10),  
mpi-default-dev, mpi-default-bin,
python3-dev, libpython3-dev, python3-distutils, pybind11-dev
diff --git 
a/debian/patches/0003-cmake-Work-around-missing-imported-Alberta-targets.patch 
b/debian/patches/0003-cmake-Work-around-missing-imported-Alberta-targets.patch
new file mode 100644
index 0..e716106e5
--- /dev/null
+++ 
b/debian/patches/0003-cmake-Work-around-missing-imported-Alberta-targets.patch
@@ -0,0 +1,27 @@
+From: Markus Blatt 
+Date: Fri, 23 Dec 2022 13:32:43 +0100
+Subject: [cmake]  Work around missing imported Alberta targets.
+
+For the autopkgtest Alberta is not searched before dune-grid and
+hence leading to errors about missing imported targets.
+
+With this workaround we make sure that Alberta is searched for before
+dune-grid to prevent this.
+---
+ opm-simulators-prereqs.cmake | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/opm-simulators-prereqs.cmake b/opm-simulators-prereqs.cmake
+index 69fb165..4640914 100644
+--- a/opm-simulators-prereqs.cmake
 b/opm-simulators-prereqs.cmake
+@@ -28,6 +28,9 @@ set (opm-simulators_DEPS
+   # Various runtime library enhancements
+   "Boost 1.44.0
+ COMPONENTS date_time system unit_test_framework REQUIRED"
++  # work around issue in the CMake dependecy search order
++  # We need some imported targets before the othr
++  "Alberta"
+   # DUNE prerequisites
+   "dune-common REQUIRED"
+   "dune-istl REQUIRED"
diff --git a/debian/patches/series b/debian/patches/series
index 0f35f5775..309f2d0e1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Fixed-typo-acess-access.patch
 0002-Use-SKIP_BUILD_RPATH-for-python-lib-of-simulators.patch
+0003-cmake-Work-around-missing-imported-Alberta-targets.patch
diff --git a/debian/rules b/debian/rules
index 598aeb7e3..f18fc8bbd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,10 +18,12 @@ ifneq ("$(wildcard $(OPM_LIB_DEBIAN_MK))","")
 include $(OPM_LIB_DEBIAN_MK) # for makeshlibs
 endif
 
-# Set DEBIAN_FORCE_PARALLEL to compile in parallel
-ifeq ($(strip $(DEBIAN_FORCE_PARALLEL)),)
-   DEB_PARALLEL="--max-parallel=1"
-endif
+# require 4GB of RAM per make process
+need_gb_ram_per_process=4
+free_ram=$(shell free -g | sed -n 2p| sed "s/ \+/ /g"| cut -d " " -f 2)
+max_procs=$(shell echo "$(free_ram)/$(need_gb_ram_per_process)" | bc)
+parallel_procs=$(shell if test "$(max_procs)" -lt "1"; then echo 1; else echo 
"$(max_procs)"; fi)
 
 %:
-   dh $@ --with python3 $(DEB_PARALLEL)
+   echo "ram in gb: $(free_ram), needed ram per thread: 
$(need_gb_ram_per_process), threads: $(parallel_procs)"
+   dh $@ --with python3 --max-parallel=$(parallel_procs)

Bug#1034380: unblock: opm-models/2022.10+ds-4

2023-04-13 Thread Markus Blatt 
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package opm-models


[ Reason ]
Package contains fixes to d/*control files. Is blocked only because britney
thinks that not all autopkgtests have run, but those for official architectures
with binaries have run

[ Impact ]
No impact on the user if this is not unblocked

[ Tests ]
All autopkgtests for architectures with binaries have run

[ Risks ]
None, because no real code is changed

[ Checklist ]
  [X] all changes are documented in the d/changelog
  [X] I reviewed all changes and I approve them
  [X] attach debdiff against the package in testing

[ Other info ]
None

unblock opm-models/2022.10+ds-4
diff --git a/debian/changelog b/debian/changelog
index 221675485..5a43ea694 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+opm-models (2022.10+ds-4) unstable; urgency=medium
+
+  * d/(tests/)control: Limit the architectures to known working ones.
+
+ -- Markus Blatt   Fri, 24 Mar 2023 09:43:28 +0100
+
+opm-models (2022.10+ds-3) unstable; urgency=medium
+
+  * Release to unstable (no-change)
+
+ -- Markus Blatt   Wed, 08 Mar 2023 23:45:45 +0100
+
+opm-models (2022.10+ds-2) experimental; urgency=medium
+
+  * d/control: Bumped standards version to 4.6.2
+
+ -- Markus Blatt   Mon, 09 Jan 2023 15:55:47 +0100
+
 opm-models (2022.10+ds-1) unstable; urgency=medium
 
   * New upstream version 2022.10
diff --git a/debian/control b/debian/control
index fa91260d4..add7ae3c6 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends: debhelper-compat (= 12), cmake,
 # Build-Depends-Indep: # broken on precise pbuilder
  doxygen, texlive-latex-extra, texlive-latex-recommended, ghostscript,
  zlib1g-dev
-Standards-Version: 4.6.0
+Standards-Version: 4.6.2
 Homepage: http://opm-project.org
 Vcs-Browser: https://salsa.debian.org/science-team/opm-models
 Vcs-Git: https://salsa.debian.org/science-team/opm-models.git
@@ -20,7 +20,7 @@ Rules-Requires-Root: no
 
 Package: libopm-models-dev
 Section: libdevel
-Architecture: any
+Architecture: amd64 arm64 armel ia64 m68k mips64el mipsel ppc64el riscv64
 Multi-Arch: same
 Depends: ${misc:Depends},
  libdune-grid-dev, libdune-istl-dev,
diff --git a/debian/tests/control b/debian/tests/control
index 423df4959..fdc4cac7a 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -6,3 +6,4 @@ Depends:
   libboost-test-dev
 # skip test on architectures where there is no installable package (e.g. 32bit)
 Restrictions: allow-stderr, skip-not-installable
+Architecture: amd64 arm64 armel ia64 m68k mips64el mipsel ppc64el riscv64

Bug#1034379: unblock: opm-material/2022.10+ds-4

2023-04-13 Thread Markus Blatt 
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package opm-material


[ Reason ]
New package contains various cleanups in debian/*control files.
Only blocked by britney, because it thinks that not all autopkgtest have run,
but they have for official architectures with binaries.

[ Impact ]
No direct impact on user-

[ Tests ]
All autopkgtests on official architectures with binaries have run successfully

[ Risks ]
None that I can think off.

[ Checklist ]
  [X] all changes are documented in the d/changelog
  [X] I reviewed all changes and I approve them
  [X] attach debdiff against the package in testing

[ Other info ]
None

unblock opm-material/2022.10+ds-4
diff --git a/debian/changelog b/debian/changelog
index 0c12d4aa..eacf04c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+opm-material (2022.10+ds-4) unstable; urgency=medium
+
+  * d/(tests/)control: Limit the architectures to known working ones.
+
+ -- Markus Blatt   Fri, 24 Mar 2023 09:33:42 +0100
+
+opm-material (2022.10+ds-3) unstable; urgency=medium
+
+  * d/control: Removed unneeded git from Build-Depends.
+
+ -- Markus Blatt   Wed, 08 Mar 2023 23:37:43 +0100
+
+opm-material (2022.10+ds-2) experimental; urgency=medium
+
+  * d/control: Bump standards version to 4.6.2 (no-change)
+
+ -- Markus Blatt   Mon, 09 Jan 2023 11:35:45 +0100
+
 opm-material (2022.10+ds-1) unstable; urgency=medium
 
   * New upstream version 2022.10
diff --git a/debian/control b/debian/control
index d1d6ea3e..75591d3c 100644
--- a/debian/control
+++ b/debian/control
@@ -5,10 +5,10 @@ Uploaders: Arne Morten Kvarving 
, Markus Blatt <
 Build-Depends: debhelper-compat (= 12),
pkg-config, libopm-common-dev (>= 2022.10), quilt,  
libboost-test-dev,
libdune-common-dev, cmake, bc,
-   git, zlib1g-dev, libtool, doxygen,  graphviz,
+   zlib1g-dev, libtool, doxygen,  graphviz,
texlive-latex-extra, texlive-latex-recommended, ghostscript,
mpi-default-dev, mpi-default-bin, libatlas-base-dev
-Standards-Version: 4.6.0
+Standards-Version: 4.6.2
 Section: libs
 Homepage: http://opm-project.org
 Vcs-Browser: https://salsa.debian.org/science-team/opm-material
@@ -17,7 +17,7 @@ Rules-Requires-Root: no
 
 Package: libopm-material-dev
 Section: libdevel
-Architecture: any
+Architecture: amd64 arm64 armel ia64 m68k mips64el mipsel ppc64el riscv64
 Multi-Arch: same
 Depends: ${misc:Depends}, libopm-common-dev (>= 2022.10), libdune-common-dev
 Replaces: libopm-material1-dev
diff --git a/debian/tests/control b/debian/tests/control
index d07f6ee1..ad95245a 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -6,3 +6,4 @@ Depends:
   libboost-test-dev
 # skip test on architectures where there is no installable package (e.g. 32bit)
 Restrictions: allow-stderr, skip-not-installable
+Architecture: amd64 arm64 armel ia64 m68k mips64el mipsel ppc64el riscv64

Bug#1034377: unblock: opm-grid/2022.10+ds-3

2023-04-13 Thread Markus Blatt 
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package opm-grid


[ Reason ]
Only debian/control has been cleaned up.
Blocked only because britney thinks not all autopkgtests have run, but they
have for official architectures with binaries

[ Impact ]
No impact for the user if it stays blocked

[ Tests ]
autopkgtests have run successfully on all offical architectures with binaries.

[ Risks ]
None that I can think o.

[ Checklist ]
  [X] all changes are documented in the d/changelog
  [X] I reviewed all changes and I approve them
  [X] attach debdiff against the package in testing

[ Other info ]
None

unblock opm-grid/2022.10+ds-3
diff --git a/debian/changelog b/debian/changelog
index ea72b63d..d008b89a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+opm-grid (2022.10+ds-3) unstable; urgency=medium
+
+  * d/control: Removed unneeded git from Build-Depends.
+
+ -- Markus Blatt   Wed, 08 Mar 2023 23:49:15 +0100
+
+opm-grid (2022.10+ds-2) experimental; urgency=medium
+
+  * d/control: Bumped standards version to 4.6.2 (no-change)
+
+ -- Markus Blatt   Mon, 09 Jan 2023 12:08:19 +0100
+
 opm-grid (2022.10+ds-1) unstable; urgency=medium
 
   * New upstream version 2022.10
diff --git a/debian/control b/debian/control
index 765a482b..923f671d 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Maintainer: Debian Science Maintainers 
, Markus Blatt 

 Build-Depends: debhelper-compat (= 12), cmake (>=3.10), quilt,
libboost-system-dev, libboost-test-dev,
-   libdune-common-dev (>= 2.6), bc, git, zlib1g-dev, libtool, 
pkg-config,
+   libdune-common-dev (>= 2.6), bc, zlib1g-dev, libtool, 
pkg-config,
libdune-grid-dev (>= 2.6), libtinyxml-dev,
libdune-istl-dev (>= 2.6), doxygen, texlive-latex-extra,
texlive-latex-recommended, ghostscript,
@@ -13,7 +13,7 @@ Build-Depends: debhelper-compat (= 12), cmake (>=3.10), quilt,
   libscotchmetis-dev, libscotchparmetis-dev,
libdune-geometry-dev (>= 2.6), libtrilinos-zoltan-dev, 
mpi-default-dev,
mpi-default-bin
-Standards-Version: 4.6.0
+Standards-Version: 4.6.2
 Section: libs
 Homepage: http://opm-project.org
 Vcs-Browser: https://salsa.debian.org/science-team/opm-grid

Bug#1034376: unblock: opm-common/2022.10+ds-7

2023-04-13 Thread Markus Blatt 
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package opm-common

It contains an important fix of the printed version number. It is only blocked
because britney thinks that autopkgtests have not run, but they have

[ Reason ]
It contains an important fix of the printed version number and reduces resource
usage during the build.

[ Impact ]
No impact for users if there no binary rebuilds.
In the case of rebuilds resource usage on buildd will be much higher than with
new version.

[ Tests ]
All autopkgtest have run successfully for official architectures with binary
packages

[ Risks ]
None that I can think of

[ Checklist ]
  [X] all changes are documented in the d/changelog
  [X] I reviewed all changes and I approve them
  [X] attach debdiff against the package in testing

[ Other info ]
None

unblock opm-common/2022.10+ds-7
diff --git a/debian/changelog b/debian/changelog
index 0af409a45..a011537d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+opm-common (2022.10+ds-7) unstable; urgency=medium
+
+  * d/control: Limit the architectures to known working ones.
+
+ -- Markus Blatt   Thu, 23 Mar 2023 08:34:59 +0100
+
+opm-common (2022.10+ds-6) unstable; urgency=medium
+
+  * Reduce compile time and resources with g++-12
+  * d: Fixed version string used in binaries.
+
+ -- Markus Blatt   Wed, 08 Mar 2023 23:05:15 +0100
+
+opm-common (2022.10+ds-5) experimental; urgency=medium
+
+  * Backported fixes for python tests from upstream (to fix mipsel*?)
+  * d/rules: Try to limit parallel builds to ensure 3GB RAM per process
+
+ -- Markus Blatt   Sun, 05 Feb 2023 13:59:47 +0100
+
 opm-common (2022.10+ds-4) unstable; urgency=medium
 
   * Make sure copy_python is run before CopyHeaders Closes: #1029440
diff --git a/debian/control b/debian/control
index 86112f71a..55debe51b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ Source: opm-common
 Priority: optional
 Maintainer: Debian Science Maintainers 

 Uploaders: Arne Morten Kvarving , Markus Blatt 

-Build-Depends: cmake (>=3.10), mpi-default-bin, mpi-default-dev,
+Build-Depends: cmake (>=3.10), mpi-default-bin, mpi-default-dev, bc, procps,
debhelper-compat (= 12), libcjson-dev, libfmt-dev, quilt, 
dh-python,
-   pkg-config, git, libtool, doxygen, graphviz,
+   pkg-config, lsb-release, libtool, doxygen, graphviz,
texlive-latex-extra, texlive-latex-recommended,
ghostscript, libboost-system-dev, libboost-test-dev,
zlib1g-dev, python3-dev, libpython3-dev, python3-numpy, 
python3-distutils,
@@ -19,7 +19,7 @@ Rules-Requires-Root: no
 
 Package: libopm-common
 Pre-Depends: ${misc:Pre-Depends}
-Architecture: any
+Architecture: amd64 arm64 armel ia64 m68k mips64el mipsel ppc64el riscv64
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}
 Provides: ${opm:shared-library}
@@ -36,7 +36,7 @@ Description: Tools for Eclipse reservoir simulation files -- 
library
 
 Package: libopm-common-bin
 Pre-Depends: ${misc:Pre-Depends}
-Architecture: any
+Architecture: amd64 arm64 armel ia64 m68k mips64el mipsel ppc64el riscv64
 Multi-Arch: foreign
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: libopm-common1-bin
@@ -52,7 +52,7 @@ Description: Tools for Eclipse reservoir simulation files -- 
utility programs
 
 Package: libopm-common-dev
 Section: libdevel
-Architecture: any
+Architecture: amd64 arm64 armel ia64 m68k mips64el mipsel ppc64el riscv64
 Multi-Arch: same
 Suggests: libopm-common-doc
 Replaces: libopm-common1-dev
@@ -85,7 +85,7 @@ Description: Tools for Eclipse reservoir simulation files -- 
documentation
 Package: python3-opm-common
 Section: python
 Pre-Depends: ${misc:Pre-Depends}
-Architecture: any
+Architecture: amd64 arm64 armel ia64 m68k mips64el mipsel ppc64el riscv64
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, 
libopm-common, python3-numpy, python3-decorator
 Description: Tools for Eclipse reservoir simulation files -- Python wrappers
  The Open Porous Media (OPM) software suite provides libraries and
diff --git a/debian/opm-debian.mk b/debian/opm-debian.mk
index 3b74fbe07..ea37112a8 100644
--- a/debian/opm-debian.mk
+++ b/debian/opm-debian.mk
@@ -2,10 +2,10 @@ include /usr/share/dpkg/architecture.mk
 include /usr/share/dpkg/pkg-info.mk
 include /usr/share/dune/dune-debian.env
 
-LSB_RELEASE = lsb_release -r | sed "s/.*:\s*\([^\s]*\).*/\1/"
+LSB_RELEASE = lsb_release -d | sed "s/.*:\s\+\(.*\)/\1/"
 # Needed for reproducable builds as we use __FILE__
 export DEB_BUILD_MAINT_OPTIONS += reproducible=+fixfilepath
-OPM_DEBIAN_CMAKE_FLAGS += -DBUILD_SHARED_LIBS=1 
-DCMAKE_INSTALL_DOCDIR=share/doc/lib$(DEB_SOURCE) 
-DPYTHON_INSTALL_PREFIX=lib/python3/dist-packages 
-DOPM_INSTALL_COMPILED_PYTHON=OFF -DUSE_RUNPATH=OFF -DWITH_NATIVE=OFF 
-DUSE_MPI=ON -DUSE_BASH_COMPLETIONS_DIR=ON 
-D

Re: Changes for new upstream version (2.9.0) of DUNE (Mini-transition because of OPM)

2023-01-18 Thread Markus Blatt 

Dear Graham,

Am Sun, Jan 15, 2023 at 04:25:04PM +0200 schrieb Graham Inggs:

Hi Markus

On Tue, 3 Jan 2023 at 02:46, Markus Blatt  wrote:

Nevertheless opm-grid, opm-material, opm-models, opm-simulators, and 
opm-upscaling will
need to be rebuild for the mini-transition. Otherwise they won't work correctly


I found out about this transition after an Ubuntu developer asked me
to schedule binNMUs for some opm-* packages.  In future, you can
follow steps described [1] and file a transition bug against
release.debian.org. For now, I have scheduled binNMUs for opm-grid,
opm-material, opm-models, opm-simulators, and opm-upscaling.

I've also set up a transition tracker [2], with the following ben file:

[2] https://release.debian.org/transitions/html/dune-common-2.9.0.html


Thanks a lot Graham. That really worked like a charm and seem to finished. 
Cool.These processes
and the tools in Debian are really great.

Next time I will try to do that myself to avoid confusion.
Is the upload to NEW for dune-common optional as the package name stays the 
same?

Cheers,

Markus
--

Dr. Markus Blatt - HPC-Simulation-Software & Services http://www.dr-blatt.de
Pedettistr. 38, 85072 Eichstätt, Germany,  USt-Id: DE279960836
Tel.: +49 (0) 160 97590858

Bug#1006836: transition: python3.10 as default

2022-04-01 Thread Markus Blatt 

Hi,

Am Wed, Mar 30, 2022 at 12:22:29PM +0200 schrieb Markus Blatt:

I think I figured out what the issue is. The cmake configuration files of all 
opm modules
have an explicit list of libraries that need to be linked with the library of 
the module and
this is always used for linking. This list is only updated if the 
module/package is rebuilt.
All modules built before the transition have a reference to 
/usr/lib/x86_64-linux-gnu/libpython3.9.so which was in the Cmake 
configuration file of opm-common

when they where built. The only way to get rid of them seems to be rebuilding 
all. Hence one
would need to change the dependencies along the following lines

dependency level 3: opm-grid, opm-material, dependency level 4: 
opm-models, opm-uscaling

dependency level 5: opm-simulators (currently level 3)



As there were some packaging improvements lying aroud anyway, I pushed new
releases for opm-grid, opm-material, opm-models, opm-upscaling. They did
build fine and are now installed in sid. I think this should fix the problem
for opm-simulators, once you trigger a rebuild. (At least it work in the 
salsa-ci).

HTH,

Markus

Bug#1006836: transition: python3.10 as default

2022-03-30 Thread Markus Blatt 

Hi,

Am Wed, Mar 30, 2022 at 09:45:30AM +0200 schrieb Markus Blatt:

Am Tue, Mar 29, 2022 at 09:28:22PM +0200 schrieb Graham Inggs:

It seems opm-simulators FTBFS in much the same way now after
opm-common has been rebuilt.



I will take a look and try to fix it. It seems there is a reference to 
libpython3.9.so.



I think I figured out what the issue is. The cmake configuration files of all 
opm modules
have an explicit list of libraries that need to be linked with the library of 
the module and
this is always used for linking. This list is only updated if the 
module/package is rebuilt.
All modules built before the transition have a reference to 
/usr/lib/x86_64-linux-gnu/libpython3.9.so which was in the Cmake configuration file of opm-common

when they where built. The only way to get rid of them seems to be rebuilding 
all. Hence one
would need to change the dependencies along the following lines

dependency level 3: opm-grid, opm-material, 
dependency level 4: opm-models, opm-uscaling

dependency level 5: opm-simulators (currently level 3)

Note that opm-upscaling is only needed because: if a user searches for it in 
its project,
then compilation will fail in the same manner as opm-simulators is failing 
currently.

Explanation why it is the way it is:
It is the way OPM uses CMake, these scripts date back to an old Cmake version 
(without support
for targets). At that time this approach was (or seemed to be) needed for 
static libraries. Otherwise
there would have been linker errors, because we use embedded python in 
opm-common. Updating to modern
CMake targets would have prevented this issue.

Sorry for the trouble and HTH.

Cheers,

Markus

Bug#1006836: transition: python3.10 as default

2022-03-30 Thread Markus Blatt 

Hi,

Am Tue, Mar 29, 2022 at 09:28:22PM +0200 schrieb Graham Inggs:

It seems opm-simulators FTBFS in much the same way now after
opm-common has been rebuilt.



I will take a look and try to fix it. It seems there is a reference to 
libpython3.9.so.

Markus

Bug#1006836: transition: python3.10 as default

2022-03-28 Thread Markus Blatt 

Hi,

I just took a look at the tracker and noticed that opm-common is level 3 and
opm-simulators is level 2. If build attempts for level 3 come after level 2
that migth explain the failure in the logs [1] and opm-common should be in a
level before opm-simulators.

If there is anything that I need to do on my side as a maintainer then please 
let me know.

Cheers,

Markus

[1] 
https://buildd.debian.org/status/fetch.php?pkg=opm-simulators&arch=amd64&ver=2021.10-4%2Bb1&stamp=1648476056&raw=0