Skip to content

Commit

Permalink
- Debian: Tag debian package release 1.0
Browse files Browse the repository at this point in the history
- Debian: Fix package deps for libpcre2
- Build: Fix configugration of lfag OSTRINGSTREAM_VIEW
- QA: Fix Slurm memory allocation
  • Loading branch information
nmoriniere-gpfw committed Apr 26, 2024
1 parent 2722ac5 commit dcc63fe
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion _bin/sys_config
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ cat <<"EOF" > ostringstream_view.cc
#include <sstream>
std::string_view ossv = std::ostringstream().view() ;
EOF
if $CXX -c -std=c++20 -o ostringstream_view.o -xc ostringstream_view.cc 2>/dev/null
if $CXX -c -std=c++20 -o ostringstream_view.o ostringstream_view.cc
then HAS_OSTRINGSTREAM_VIEW=1
else HAS_OSTRINGSTREAM_VIEW=0
fi
Expand Down
4 changes: 2 additions & 2 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
open-lmake (0.1-1) UNRELEASED; urgency=low
open-lmake (1.0-1) UNRELEASED; urgency=low

* Initial release.

-- Cesar Douady <[email protected]> Fri, 15 Dec 2023 10:28:21 +0100
-- Cesar Douady <[email protected]> Wed, 24 Apr 2024 14:22:52 +0200
6 changes: 4 additions & 2 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ Build-Depends:
texinfo,
python3,
libslurm-dev,
libseccomp-dev
libseccomp-dev,
libpcre2-dev
Standards-Version: 4.6.2
Homepage: https://github.com/cesar-douady/open-lmake

Expand All @@ -17,7 +18,8 @@ Architecture: amd64 arm64
Depends:
${misc:Depends},
${shlibs:Depends},
python3
python3,
libpcre2-8-0
Recommends: libslurm37 | libslurm38 | libslurm39 | libslurm40
Description: pythonic workflow management system
Build systems like GNU Make are frequently used to create complicated
Expand Down
3 changes: 2 additions & 1 deletion lmake_env/Lmakefile.py
Original file line number Diff line number Diff line change
Expand Up @@ -227,13 +227,14 @@ def cmd() :
)
n_tokens = config.backends.local.cc
resources = pdict()
if True : resources.mem = '512M'
if True : resources.mem = '1G'
if backend=='local' : resources.cc = 1

class LinkRule(PathRule) :
combine = ('pre_opts','rev_post_opts')
pre_opts = [] # options before inputs & outputs
rev_post_opts = [] # options after inputs & outputs, combine appends at each level, but here we want to prepend
resources = {'mem': '1G'}
def cmd() :
run_gxx( TARGET
, *pre_opts
Expand Down

0 comments on commit dcc63fe

Please sign in to comment.