[med-svn] [Git][med-team/bali-phy][master] 6 commits: New upstream version 3.5.0.2+dfsg
Andreas Tille
gitlab at salsa.debian.org
Fri Sep 25 15:16:29 BST 2020
Andreas Tille pushed to branch master at Debian Med / bali-phy
Commits:
5a34d09a by Andreas Tille at 2020-09-25T15:50:19+02:00
New upstream version 3.5.0.2+dfsg
- - - - -
de4a7631 by Andreas Tille at 2020-09-25T15:50:19+02:00
routine-update: New upstream version
- - - - -
4f9e4be4 by Andreas Tille at 2020-09-25T15:50:24+02:00
Update upstream source from tag 'upstream/3.5.0.2+dfsg'
Update to upstream version '3.5.0.2+dfsg'
with Debian dir 94d4682ecb0dde2609ea1b03d060dda7c8a77a79
- - - - -
32b2d041 by Andreas Tille at 2020-09-25T15:50:24+02:00
routine-update: debhelper-compat 13
- - - - -
05c67a08 by Andreas Tille at 2020-09-25T15:50:28+02:00
routine-update: Rules-Requires-Root: no
- - - - -
85d5123d by Andreas Tille at 2020-09-25T16:12:05+02:00
routine-update: Ready to upload to unstable
- - - - -
10 changed files:
- .github/workflows/build.yml
- debian/changelog
- debian/control
- doc/README.itex.xml
- meson.build
- src/bali-phy/bali-phy.cc
- src/models/model.cc
- src/models/parameters.cc
- src/util/include/util/ptree.H
- src/util/ptree.cc
Changes:
=====================================
.github/workflows/build.yml
=====================================
@@ -14,6 +14,7 @@ jobs:
matrix:
name: [ubuntu-gcc-8,
ubuntu-gcc-9,
+ ubuntu-gcc-10,
ubuntu-clang-8,
macos-xcode-11.3.1
]
@@ -29,6 +30,11 @@ jobs:
compiler: gcc
version: "9"
+ - name: ubuntu-gcc-10
+ os: ubuntu-latest
+ compiler: gcc
+ version: "10"
+
- name: ubuntu-clang-8
os: ubuntu-latest
compiler: clang
@@ -64,11 +70,9 @@ jobs:
- name: Install (macOS)
if: runner.os == 'macOS'
run: |
- brew update
brew install pkg-config pandoc cairo ccache coreutils
sudo xcode-select -switch /Applications/Xcode_${{ matrix.version }}.app
-
- name: Install meson
run: |
python3 -mpip install meson ninja
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+bali-phy (3.5.0.2+dfsg-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream version
+ * debhelper-compat 13 (routine-update)
+ * Rules-Requires-Root: no (routine-update)
+
+ -- Andreas Tille <tille at debian.org> Fri, 25 Sep 2020 15:50:32 +0200
+
bali-phy (3.5.0.1+dfsg-1) unstable; urgency=medium
[ Steffen Moeller ]
=====================================
debian/control
=====================================
@@ -3,7 +3,7 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
Uploaders: Benjamin Redelings <benjamin.redelings at gmail.com>
Section: science
Priority: optional
-Build-Depends: debhelper-compat (= 12),
+Build-Depends: debhelper-compat (= 13),
meson (>=0.52),
libcairo2-dev,
libeigen3-dev,
@@ -20,6 +20,7 @@ Standards-Version: 4.5.0
Vcs-Browser: https://salsa.debian.org/med-team/bali-phy
Vcs-Git: https://salsa.debian.org/med-team/bali-phy.git
Homepage: http://www.bali-phy.org
+Rules-Requires-Root: no
Package: bali-phy
Architecture: any
=====================================
doc/README.itex.xml
=====================================
@@ -1,5 +1,5 @@
<!DOCTYPE book [
-<!ENTITY version "3.5" >
+<!ENTITY version "3.5.0" >
<!ENTITY source.file "bali-phy-&version;.tar.gz" >
<!ENTITY linux64.file "bali-phy-&version;-linux64.tar.gz" >
=====================================
meson.build
=====================================
@@ -1,10 +1,10 @@
project('bali-phy', ['cpp','c'],
- version: '3.5',
+ version: '3.5.0.2',
default_options : [
'warning_level=3',
'cpp_std=c++17'
],
- meson_version: '>= 0.52',
+ meson_version: '>= 0.53',
license: 'GPLv2')
cpp = meson.get_compiler('cpp')
@@ -38,13 +38,18 @@ if get_option('optimization') == '2' or get_option('optimization') == '3'
add_project_arguments(['-DNDEBUG','-DNDEBUG_DP']+cpp.get_supported_arguments(opt_flags), language : 'cpp')
endif
+threads = dependency('threads')
+
if host_machine.system() == 'darwin'
add_project_arguments('-fvisibility=default', language : 'cpp')
endif
cairo = dependency('cairo', required: false)
if not cairo.found()
+ used_cairo = 'not found'
cairo = disabler()
+else
+ used_cairo = 'system'
endif
install_data('scripts/bp-analyze', install_mode: 'rwxr-xr-x', install_dir: 'bin')
@@ -75,11 +80,15 @@ endif
# FIXME: Perhaps use our own if we think the system one won't work
## Handle auto / system / internal method of finding/building BOOST
+used_boost = get_option('boost')
if get_option('boost') == 'auto'
boost = dependency('boost', modules : boost_modules, version: '>=1.63', required: false)
if not boost.found()
message('Building internal BOOST libraries.')
subdir('external/boost')
+ used_boost = 'internal'
+ else
+ used_boost = 'system'
endif
elif get_option('boost') == 'system'
boost = dependency('boost', modules : boost_modules)
@@ -88,12 +97,16 @@ else
endif
## Handle auto / system / internal method of finding/building EIGEN
+used_eigen = get_option('eigen')
if get_option('eigen') == 'auto'
eigen = dependency('eigen3', required: false).as_system()
if not eigen.found()
+ used_eigen = 'internal'
message('Using internal copy of eigen.')
eigen = include_directories('external/eigen3', is_system: true)
eigen = declare_dependency(include_directories: eigen)
+ else
+ used_eigen = 'system'
endif
elif get_option('eigen') == 'system'
eigen = dependency('eigen3').as_system()
@@ -103,10 +116,13 @@ else
endif
## Handle auto / system / internal method of finding <nlohmann/json.hpp>
+used_json = get_option('json')
if get_option('json') == 'auto'
if cpp.has_header('nlohmann/json.hpp')
+ used_json = 'system'
json = []
else
+ used_json = 'internal'
message('Using internal copy of <nlohman/json.hpp>.')
json = include_directories('external/nlohmann', is_system: true)
json = declare_dependency(include_directories: json)
@@ -130,8 +146,10 @@ else
endif
if cpp.has_header('range/v3/view/take.hpp')
+ used_librange = 'system'
librange = []
else
+ used_librange = 'internal'
subdir('external/range-v3/')
endif
@@ -156,3 +174,20 @@ test('bali-phy testsuite',
timeout: 3000,
workdir: meson.source_root()/'tests',
args:[baliphy.full_path(), packagepath])
+
+summary({'host': host_machine.system()
+ }, section: 'Architecture')
+
+summary({'BOOST': used_boost,
+ 'Eigen': used_eigen,
+ 'nlohmann::json': used_json,
+ 'range v3': used_librange,
+ 'cairo': used_cairo
+ },section: 'Libraries')
+
+summary({'prefix': get_option('prefix'),
+ },section: 'Directories')
+
+summary({'optimization': get_option('optimization'),
+ 'debug': get_option('debug'),
+ },section: 'Configuration')
=====================================
src/bali-phy/bali-phy.cc
=====================================
@@ -574,7 +574,9 @@ int main(int argc,char* argv[])
std::cout<<table_logger_line(*TL, *M, 0)<<"\n";
if (log_formats.count("json"))
std::cout<<logged_params_and_some_computed_stuff(*M, 0)<<"\n";
- M->show_graph();
+
+ if (args.count("verbose"))
+ M->show_graph();
}
else
{
=====================================
src/models/model.cc
=====================================
@@ -20,7 +20,6 @@
#include <set>
#include <map>
-#include <boost/variant.hpp>
#include "util/ptree.H"
#include "util/string/join.H"
=====================================
src/models/parameters.cc
=====================================
@@ -1215,7 +1215,7 @@ int get_num_models(const vector<optional<int>>& mapping)
if (model)
{
assert(*model >= 0);
- m = std::max(*model,-1);
+ m = std::max(m,*model);
models.insert(*model);
}
=====================================
src/util/include/util/ptree.H
=====================================
@@ -6,7 +6,7 @@
#include <utility>
#include <vector>
-#include <boost/variant.hpp>
+#include <variant>
#include <optional>
#include "util/json.hh"
@@ -22,7 +22,7 @@ struct ptree;
struct ptree: public std::vector<std::pair<std::string,ptree>>
{
public:
- typedef boost::variant<monostate,std::string,int,double,bool> value_t;
+ typedef std::variant<monostate,std::string,int,double,bool> value_t;
value_t value;
bool value_is_empty() const;
@@ -32,8 +32,8 @@ public:
template <typename T> bool has_value() const {return false;}
template <typename T> bool is_a() const {return empty() and has_value<T>();}
- template <typename T> T& get_value() {return boost::get<T>(value);}
- template <typename T> const T& get_value() const {return boost::get<T>(value);}
+ template <typename T> T& get_value() {return std::get<T>(value);}
+ template <typename T> const T& get_value() const {return std::get<T>(value);}
template <typename T> void put_value(const T& t) {value = t;}
void put_value(const char* s) {put_value<std::string>(s);}
@@ -128,15 +128,16 @@ public:
ptree(const value_t& v,const std::vector<std::pair<std::string,ptree>>& x):std::vector<std::pair<std::string,ptree>>(x),value(v) { }
};
-template <> inline bool ptree::has_value<bool>() const {return value.which() == 4;}
-template <> inline bool ptree::has_value<int>() const {return value.which() == 2;}
-template <> inline bool ptree::has_value<double>() const {return value.which() == 3;}
-template <> inline bool ptree::has_value<std::string>() const {return value.which() == 1;}
+template <> inline bool ptree::has_value<bool>() const {return value.index() == 4;}
+template <> inline bool ptree::has_value<int>() const {return value.index() == 2;}
+template <> inline bool ptree::has_value<double>() const {return value.index() == 3;}
+template <> inline bool ptree::has_value<std::string>() const {return value.index() == 1;}
std::string show(const ptree& pt, int depth=0);
void to_json(json& j, const ptree::value_t& p);
void to_json(json& j, const ptree& p);
+std::ostream& operator<<(std::ostream& o, const ptree::value_t& v);
#endif
=====================================
src/util/ptree.cc
=====================================
@@ -13,7 +13,7 @@ std::ostream& operator<<(std::ostream& o,const monostate&) {o<<"()";return o;}
bool ptree::value_is_empty() const
{
- return value.which() == 0;
+ return value.index() == 0;
}
bool ptree::is_null() const
@@ -217,16 +217,16 @@ string show(const ptree& pt, int depth)
void to_json(json& j, const ptree::value_t& v)
{
- if (v.which() == 0)
+ if (v.index() == 0)
;
- else if (v.which() == 1)
- j = boost::get<std::string>(v);
- else if (v.which() == 2)
- j = boost::get<int>(v);
- else if (v.which() == 3)
- j = boost::get<double>(v);
- else if (v.which() == 4)
- j = boost::get<bool>(v);
+ else if (v.index() == 1)
+ j = std::get<std::string>(v);
+ else if (v.index() == 2)
+ j = std::get<int>(v);
+ else if (v.index() == 3)
+ j = std::get<double>(v);
+ else if (v.index() == 4)
+ j = std::get<bool>(v);
else
std::abort();
}
@@ -245,3 +245,21 @@ void to_json(json& j, const ptree& p)
}
j = {{"value",value},{"args",args}};
}
+
+std::ostream& operator<<(std::ostream& o, const ptree::value_t& v)
+{
+ if (std::holds_alternative<monostate>(v))
+ o<<"()";
+ if (std::holds_alternative<bool>(v))
+ o<<std::get<bool>(v);
+ else if (std::holds_alternative<int>(v))
+ o<<std::get<int>(v);
+ else if (std::holds_alternative<std::string>(v))
+ o<<"'"<<std::get<string>(v)<<"'";
+ else if (std::holds_alternative<double>(v))
+ o<<std::get<double>(v);
+ else
+ std::abort();
+ return o;
+}
+
View it on GitLab: https://salsa.debian.org/med-team/bali-phy/-/compare/cc69ab8bef24e1ab8c68ed133896f634be67f4ec...85d5123d0a847343709181917c8635be269f9f6f
--
View it on GitLab: https://salsa.debian.org/med-team/bali-phy/-/compare/cc69ab8bef24e1ab8c68ed133896f634be67f4ec...85d5123d0a847343709181917c8635be269f9f6f
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20200925/c29fdd79/attachment-0001.html>
More information about the debian-med-commit
mailing list