Accepting request 828264 from home:bnavigator:branches:science

- revert the memoryperjob change. The build process really acquires
  that much memory per job and the workers cannot provide 3GB per
  CPU core. Sadly, we are limited by memory not by CPU cores.
- require 11 GB of RAM. This allows us to run 3 jobs in parallel and
  can be provided by all architectures

OBS-URL: https://build.opensuse.org/request/show/828264
OBS-URL: https://build.opensuse.org/package/show/science/PrusaSlicer?expand=0&rev=13
This commit is contained in:
2020-08-20 19:00:03 +00:00
committed by Git OBS Bridge
parent 3318c426da
commit bbaa80a2eb
3 changed files with 20 additions and 6 deletions

View File

@@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Aug 20 15:50:07 UTC 2020 - Benjamin Greiner <code@bnavigator.de>
- revert the memoryperjob change. The build process really acquires
that much memory per job and the workers cannot provide 3GB per
CPU core. Sadly, we are limited by memory not by CPU cores.
- require 11 GB of RAM. This allows us to run 3 jobs in parallel and
can be provided by all architectures
-------------------------------------------------------------------
Thu Aug 20 09:03:33 UTC 2020 - Martin Liška <mliska@suse.cz>

View File

@@ -45,6 +45,7 @@ BuildRequires: libboost_system-devel
BuildRequires: libboost_thread-devel
BuildRequires: libcurl-devel
BuildRequires: libexpat-devel
BuildRequires: memory-constraints
BuildRequires: nlopt-devel
BuildRequires: openvdb-devel >= 5
BuildRequires: openvdb-tools
@@ -66,6 +67,13 @@ It also works with Mach3, LinuxCNC and Machinekit controllers.
sed -i 's/UNKNOWN/OpenSUSE/' version.inc
%build
# The build process really acquires that much memory per job. We are
# limited by memory not by CPU cores. Using memoryperjob in _constraints cannot
# provide any workers on some architectures. This is still better than not using
# parallel building at all.
# https://openbuildservice.org/help/manuals/obs-user-guide/cha.obs.build_job_constraints.html
# https://en.opensuse.org/openSUSE:Specfile_guidelines#Parallel_make
%limit_build -m 3072
# sse2 flags for 32-bit: see gh#prusa3d/PrusaSlicer#3781
%ifarch %ix86
export CFLAGS="%optflags -mfpmath=sse -msse2"

View File

@@ -4,11 +4,8 @@
<disk>
<size unit="G">12</size>
</disk>
<memory>
<size unit="G">8</size>
</memory>
<memoryperjob>
<size unit="M">1024</size>
</memoryperjob>
<physicalmemory>
<size unit="G">11</size>
</physicalmemory>
</hardware>
</constraints>