93fdeb0 Merge branch 'tho/bigarray-hotfix' into 'master'

circe2/src/Makefile.am

@@ -37,7 +37,7 @@ OCAML_BIGARRAY_CMXA=@OCAML_BIGARRAY_CMXA@
 lib_LTLIBRARIES =
 SOURCE_FILES =
 MODULE_FILES =
-EXTRA_SOURCE_FILES = bigarray_library.ml bigarray_module.ml
+EXTRA_SOURCE_FILES = bigarray_library.ml bigarray_module.ml bigarray_compat.mli
 NOWEB_FILES = prelude.nw postlude.nw
 
 ########################################################################

circe2/src/Makefile.sources

@@ -39,7 +39,6 @@
 ########################################################################
 
 CIRCE2_ML_SRC_1 = \
-	bigarray_compat.ml \
 	OUnit.ml OUnitDiff.ml thoArray.ml thoMatrix.ml \
 	float.ml diffmap.ml diffmaps.ml filter.ml division.ml grid.ml \
 	events.ml syntax.ml
@@ -58,9 +57,9 @@ CIRCE2_DERIVED = $(CIRCE2_ML_DERIVED) $(CIRCE2_MLI_DERIVED)
 
 CIRCE2_ML = $(CIRCE2_ML_SRC_1) $(CIRCE2_ML_DERIVED) $(CIRCE2_ML_SRC_2)
 CIRCE2_MLI = $(CIRCE2_ML:.ml=.mli)
-CIRCE2_CMO = $(CIRCE2_ML:.ml=.cmo)
-CIRCE2_CMX = $(CIRCE2_ML:.ml=.cmx)
-CIRCE2_CMI = $(CIRCE2_ML:.ml=.cmi)
+CIRCE2_CMO = bigarray_compat.cmo $(CIRCE2_ML:.ml=.cmo)
+CIRCE2_CMX = bigarray_compat.cmx $(CIRCE2_ML:.ml=.cmx)
+CIRCE2_CMI = bigarray_compat.cmi $(CIRCE2_ML:.ml=.cmi)
 CIRCE2_INTERFACE = $(CIRCE2_ML:.ml=.interface)
 CIRCE2_IMPLEMENTATION = $(CIRCE2_ML:.ml=.implementation)
 

circe2/src/circe2.nw

@@ -523,8 +523,8 @@ subroutine circe2_generate_polarized (c2s, rng, p, pol, x)
   call circe2_generate (c2s, rng, x, p, h)
   call circe2_density_matrix (c2s, pol, p, x)
   pol00 = pol(0,0)
-  do i1 = 0, 4
-     do i2 = 0, 4
+  do i1 = 0, 3
+     do i2 = 0, 3
         pol(i1,i2) = pol(i1,i2) / pol00
      end do
   end do

circe2/src/opam_versions.sh

+#! /bin/sh
+########################################################################
+# This script is for developers only and needs not to be portable.
+# This script assumes an opam installation with many versions of
+# O'Caml available as switches.
+########################################################################
+# tl;dr : don't try this at home, kids ;)
+########################################################################
+
+src=$(dirname $(realpath $0))
+root=$(dirname $(dirname $src))
+build=$root/_build
+log=$src/opam_versions.out
+
+versions="$1"
+if [ -z "$versions" ]; then
+    versions="$(opam switch -s)"
+fi
+
+rm -f $log
+
+for switch in $versions; do
+  opam switch $switch >/dev/null || exit 2
+  opam switch show
+  eval $(opam env)
+  cd $root
+  ./build_master.sh CIRCE2
+  rm -fr $build/$switch
+  mkdir -p $build/$switch
+  cd $build/$switch
+  $root/configure --enable-distribution --disable-static
+  make -j $(getconf _NPROCESSORS_ONLN) && \
+  make -j $(getconf _NPROCESSORS_ONLN) check distcheck
+  if [ "$?" = 0 ]; then
+    echo "$switch PASS" >> $log
+  else
+    echo "$switch FAIL" >> $log
+  fi
+done