about summary refs log tree commit diff
path: root/var_lib_genenet_bnw
diff options
context:
space:
mode:
Diffstat (limited to 'var_lib_genenet_bnw')
-rwxr-xr-xvar_lib_genenet_bnw/build.sh32
-rw-r--r--var_lib_genenet_bnw/k-best/src/get_kbest_nets.cc47
2 files changed, 43 insertions, 36 deletions
diff --git a/var_lib_genenet_bnw/build.sh b/var_lib_genenet_bnw/build.sh
index c2975ff4..4dc345f4 100755
--- a/var_lib_genenet_bnw/build.sh
+++ b/var_lib_genenet_bnw/build.sh
@@ -1,6 +1,32 @@
 #!/bin/bash
-gcc ./localscore/network_score.c $(pkgconf --libs libRmath) -lm -o network_score
-gcc ./print_structure/structure.c -lm -o structure
+# Build the four C/C++ programs the structure-learning pipeline needs.
+#
+# The sources predate C99 and C++11: network_score and structure rely on
+# implicit int and fall off the end of main(), and get_kbest_nets used SGI's
+# <ext/hash_set>.  -std=gnu89 keeps the C compiling on a modern gcc, and
+# get_kbest_nets.cc was ported to std::unordered_set (see the comment at its
+# hash-set block) so no compatibility flag is needed there.
+#
+# network_score needs R's standalone math library:
+#   guix shell rmath-standalone gcc-toolchain -- ./build.sh
+set -e
+CFLAGS=${CFLAGS:--O2 -std=gnu89 -w}
+
+RMATH_PREFIX=${RMATH_PREFIX:-}
+if [ -z "$RMATH_PREFIX" ]; then
+    # ask pkgconf if it is around, else fall back to $R_HOME / the usual names
+    if command -v pkgconf >/dev/null 2>&1; then
+        RMATH_LIBS=$(pkgconf --libs libRmath)
+    fi
+    RMATH_PREFIX=$(dirname "$(dirname "$(command -v R 2>/dev/null || echo /usr/lib/R/bin/R)")")
+fi
+
+gcc $CFLAGS ${RMATH_PREFIX:+-I$RMATH_PREFIX/include} \
+    ./localscore/network_score.c ${RMATH_LIBS:-${RMATH_PREFIX:+-L$RMATH_PREFIX/lib -lRmath}} -lm \
+    -o network_score
+gcc $CFLAGS ./print_structure/structure.c -lm -o structure
 
 cd ./k-best/src/
-sh buildk_poster.sh
+D=${CXX:-g++}
+$D -w -O2 -o get_kbest_parents get_kbest_parents.cc
+$D -w -O2 -o get_kbest_nets get_kbest_nets.cc
diff --git a/var_lib_genenet_bnw/k-best/src/get_kbest_nets.cc b/var_lib_genenet_bnw/k-best/src/get_kbest_nets.cc
index 2ee35265..d0911cf0 100644
--- a/var_lib_genenet_bnw/k-best/src/get_kbest_nets.cc
+++ b/var_lib_genenet_bnw/k-best/src/get_kbest_nets.cc
@@ -16,24 +16,13 @@
 
 
 //HR: Add for hash_set
-#if __GNUC__ < 3 && __GNUC__ >= 2 && __GNUC_MINOR__ >= 95
-# include <hash_set>
-# include <functional>
-# define gnu_namespace std
-#elif __GNUC__ >= 3
-# include <ext/hash_set>
-# if __GNUC_MINOR__ == 0
-# include <functional>
-# define gnu_namespace std
-# else
-# include <ext/functional>
-# define gnu_namespace __gnu_cxx
-# endif
-#else
-# include <hash_set.h>
-# include <functional.h>
-# define gnu_namespace std
-#endif
+// Upstream this was a maze of #ifdefs for <hash_set>/<ext/hash_set>, which
+// C++11 and later dropped.  The set is a std::unordered_set with an explicit
+// hasher; naming the hasher (rather than specialising std::hash for a pointer
+// type, which is not allowed) is the whole portability fix.
+#include <unordered_set>
+#include <functional>
+#define gnu_namespace std
 using namespace gnu_namespace;
 #include <set>
 //
@@ -609,21 +598,13 @@ void insert_vec(list<node>* v,node s, int k){
 
 //===================================================================//
 //HR: Add hash_set to store net_set (i.e. (net, score) pair
-namespace gnu_namespace {
-	
-	template<>
+struct net_set_hash {
+	std::hash<unsigned> hasher_ns;
 
-	struct hash<const net_set*> {
-	
-		hash<unsigned> hasher_ns;
-		
-		size_t operator()(const net_set* ns) const {
-			return hasher_ns((unsigned) roundl(- ns->score*10)); // wrong hash function??
-		}
-
-	}; //end of struct
-
-} //end of namespace
+	size_t operator()(const net_set* ns) const {
+		return hasher_ns((unsigned) roundl(- ns->score*10)); // wrong hash function??
+	}
+}; //end of struct
 
 
 
@@ -635,7 +616,7 @@ struct eqNetScore{
 
 
 
-typedef hash_set<const net_set *, hash<const net_set *>, eqNetScore> NetScoreHashSet;
+typedef std::unordered_set<const net_set *, net_set_hash, eqNetScore> NetScoreHashSet;
 
 NetScoreHashSet knets;