Hello community,
here is the log from the commit of package ocaml-parmap for openSUSE:Factory
checked in at 2019-10-18 14:36:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ocaml-parmap (Old)
and /work/SRC/openSUSE:Factory/.ocaml-parmap.new.2352 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-parmap"
Fri Oct 18 14:36:24 2019 rev:6 rq:739103 version:20191002.803edbb
Changes:
--------
--- /work/SRC/openSUSE:Factory/ocaml-parmap/ocaml-parmap.changes
2019-10-08 19:59:30.651913484 +0200
+++ /work/SRC/openSUSE:Factory/.ocaml-parmap.new.2352/ocaml-parmap.changes
2019-10-18 14:36:24.887773525 +0200
@@ -1,0 +2,5 @@
+Wed Oct 9 05:48:16 UTC 2019 - oher...@suse.de
+
+- Update to version 20191002.803edbb (1.0-rc11)
+
+-------------------------------------------------------------------
Old:
----
ocaml-parmap-20190330.8d19c66.tar.xz
New:
----
ocaml-parmap-20191002.803edbb.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ocaml-parmap.spec ++++++
--- /var/tmp/diff_new_pack.1PrGWR/_old 2019-10-18 14:36:25.307772431 +0200
+++ /var/tmp/diff_new_pack.1PrGWR/_new 2019-10-18 14:36:25.307772431 +0200
@@ -17,7 +17,7 @@
Name: ocaml-parmap
-Version: 20190330.8d19c66
+Version: 20191002.803edbb
Release: 0
%{?ocaml_preserve_bytecode}
Summary: Multicore architecture exploitation for OCaml programs with
minimal modifications
@@ -28,7 +28,7 @@
BuildRequires: ocaml
BuildRequires: ocaml-oasis
BuildRequires: ocaml-ocamldoc
-BuildRequires: ocaml-rpm-macros >= 4.03
+BuildRequires: ocaml-rpm-macros >= 20191009
BuildRequires: ocamlfind(bigarray)
BuildRequires: ocamlfind(graphics)
BuildRequires: ocamlfind(unix)
@@ -55,7 +55,7 @@
%prep
-%setup -q
+%autosetup -p1
%build
echo -n > config.h
@@ -65,6 +65,15 @@
#define HAVE_DECL_SCHED_SETAFFINITY 1
_EOF_
fi
+ocaml_version="$(ocamlc -version)"
+case "${ocaml_version}" in
+ 4.03.*|4.04.*|4.05.*)
+ echo 'let map_file = Bigarray.Genarray.map_file' >>parmap_compat.ml
+ ;;
+ *)
+ echo 'let map_file = Unix.map_file' >>parmap_compat.ml
+ ;;
+esac
rm -fv setup.ml myocamlbuild.ml META* _* */_*
# obs service changes every ^Version line ...
sh -c "sed 's/^Version.*/Version: %{version}/' | tee _oasis" <<_EOF_
@@ -81,7 +90,7 @@
Library parmap
Path: .
Install: true
- Modules: Parmap
+ Modules: Parmap, Parmap_compat
CSources: bytearray_stubs.c, setcore_stubs.c, config.h
CCOpt: %{optflags} -I$PWD -Werror -D_GNU_SOURCE
@@ -108,45 +117,11 @@
%install
%ocaml_oasis_findlib_install
-#
-mkdir -vp %{buildroot}/etc/ld.so.conf.d/
-tee %{buildroot}/etc/ld.so.conf.d/%{name}.conf <<_EOF_
-%{_libdir}/ocaml/parmap
-_EOF_
-#
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%ocaml_create_file_list
-%files
-%defattr(-,root,root)
-%doc README.md LICENSE
-/etc/ld.so.conf.d/*.conf
+%files -f %{name}.files
+%doc README.md
%{_bindir}/*
-%dir %{_libdir}/ocaml
-%dir %{_libdir}/ocaml/*
-%if 0%{?ocaml_native_compiler}
-%{_libdir}/ocaml/*/*.cmxs
-%endif
-%{_libdir}/ocaml/*/*.so
-
-%files devel
-%defattr(-,root,root,-)
-%doc LICENSE
-%{oasis_docdir_html}
-%dir %{_libdir}/ocaml/*
-%{_libdir}/ocaml/*/*.a
-%if 0%{?ocaml_native_compiler}
-%{_libdir}/ocaml/*/*.cmx
-%{_libdir}/ocaml/*/*.cmxa
-%endif
-%{_libdir}/ocaml/*/*.annot
-%{_libdir}/ocaml/*/*.cma
-%{_libdir}/ocaml/*/*.cmi
-%{_libdir}/ocaml/*/*.cmt
-%{_libdir}/ocaml/*/*.cmti
-%{_libdir}/ocaml/*/*.mli
-%{_libdir}/ocaml/*/META
-%changelog
+%files devel -f %{name}.files.devel
+%{oasis_docdir_html}
++++++ _service ++++++
--- /var/tmp/diff_new_pack.1PrGWR/_old 2019-10-18 14:36:25.331772369 +0200
+++ /var/tmp/diff_new_pack.1PrGWR/_new 2019-10-18 14:36:25.331772369 +0200
@@ -3,7 +3,7 @@
<param name="url">git://github.com/rdicosmo/parmap.git</param>
<param name="scm">git</param>
<param name="versionformat">%cd.%h</param>
- <param name="revision">master</param>
+ <param name="revision">803edbb03aedda79b0c681b4f14ea9a2f10b1514</param>
<param name="filename">ocaml-parmap</param>
</service>
<service name="recompress" mode="disabled">
++++++ ocaml-parmap-20190330.8d19c66.tar.xz ->
ocaml-parmap-20191002.803edbb.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-parmap-20190330.8d19c66/bytearray.ml
new/ocaml-parmap-20191002.803edbb/bytearray.ml
--- old/ocaml-parmap-20190330.8d19c66/bytearray.ml 2019-03-30
17:57:21.000000000 +0100
+++ new/ocaml-parmap-20191002.803edbb/bytearray.ml 2019-10-02
05:02:01.000000000 +0200
@@ -61,7 +61,9 @@
let mmap_of_string fd s =
let l = String.length s in
- let ba = Bigarray.Array1.map_file fd Bigarray.char Bigarray.c_layout true l
in
+ let ba =
+ Bigarray.array1_of_genarray @@
+ Parmap_compat.map_file fd Bigarray.char Bigarray.c_layout true [|l|] in
unsafe_blit_from_string s 0 ba 0 l;
ba
(*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-parmap-20190330.8d19c66/configure
new/ocaml-parmap-20191002.803edbb/configure
--- old/ocaml-parmap-20190330.8d19c66/configure 2019-03-30 17:57:21.000000000
+0100
+++ new/ocaml-parmap-20191002.803edbb/configure 2019-10-02 05:02:01.000000000
+0200
@@ -667,6 +667,7 @@
docdir
oldincludedir
includedir
+runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -737,6 +738,7 @@
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -989,6 +991,15 @@
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
+ -runstatedir | --runstatedir | --runstatedi | --runstated \
+ | --runstate | --runstat | --runsta | --runst | --runs \
+ | --run | --ru | --r)
+ ac_prev=runstatedir ;;
+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+ | --run=* | --ru=* | --r=*)
+ runstatedir=$ac_optarg ;;
+
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1126,7 +1137,7 @@
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir
+ libdir localedir mandir runstatedir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -1279,6 +1290,7 @@
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -6953,4 +6965,9 @@
mv Makefile_3.11 Makefile
fi
-
+echo '(* generated by configure *)' >parmap_compat.ml
+if test "$OCAMLVERSION" \< "4.06.0" ; then
+ echo 'let map_file = Bigarray.Genarray.map_file' >>parmap_compat.ml
+else
+ echo 'let map_file = Unix.map_file' >>parmap_compat.ml
+fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-parmap-20190330.8d19c66/configure.ac
new/ocaml-parmap-20191002.803edbb/configure.ac
--- old/ocaml-parmap-20190330.8d19c66/configure.ac 2019-03-30
17:57:21.000000000 +0100
+++ new/ocaml-parmap-20191002.803edbb/configure.ac 2019-10-02
05:02:01.000000000 +0200
@@ -37,4 +37,9 @@
mv Makefile_3.11 Makefile
fi
-
+echo '(* generated by configure *)' >parmap_compat.ml
+if test "$OCAMLVERSION" \< "4.06.0" ; then
+ echo 'let map_file = Bigarray.Genarray.map_file' >>parmap_compat.ml
+else
+ echo 'let map_file = Unix.map_file' >>parmap_compat.ml
+fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-parmap-20190330.8d19c66/opam
new/ocaml-parmap-20191002.803edbb/opam
--- old/ocaml-parmap-20190330.8d19c66/opam 2019-03-30 17:57:21.000000000
+0100
+++ new/ocaml-parmap-20191002.803edbb/opam 1970-01-01 01:00:00.000000000
+0100
@@ -1,29 +0,0 @@
-opam-version: "1.2"
-maintainer: "Roberto Di Cosmo <robe...@dicosmo.org>"
-authors: "Roberto Di Cosmo <robe...@dicosmo.org>"
-homepage: "https://github.com/rdicosmo/parmap";
-dev-repo: "https://github.com/rdicosmo/parmap.git";
-bug-reports: "https://github.com/rdicosmo/parmap/issues";
-build: [
- ["aclocal" "-I" "m4"]
- ["autoconf"]
- ["autoheader"]
- ["./configure"]
- [make "DESTDIR=%{prefix}%" "OCAMLLIBDIR=lib" ]
-]
-install: [
- [make "install" "DESTDIR=%{prefix}%" "OCAMLLIBDIR=lib"]
-]
-remove: [
- ["aclocal" "-I" "m4"]
- ["autoconf"]
- ["autoheader"]
- ["./configure"]
- [make "uninstall" "DESTDIR=%{prefix}%" "OCAMLLIBDIR=lib"]
-]
-depends: [
- "ocamlfind"
- "ocamlbuild" {build}
- "conf-autoconf"
- "conf-aclocal"
-]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-parmap-20190330.8d19c66/parmap.ml
new/ocaml-parmap-20191002.803edbb/parmap.ml
--- old/ocaml-parmap-20190330.8d19c66/parmap.ml 2019-03-30 17:57:21.000000000
+0100
+++ new/ocaml-parmap-20191002.803edbb/parmap.ml 2019-10-02 05:02:01.000000000
+0200
@@ -109,7 +109,8 @@
(* unmarshal from a mmap seen as a bigarray *)
let unmarshal fd =
let a =
- Bigarray.Array1.map_file fd Bigarray.char Bigarray.c_layout true (-1) in
+ Bigarray.array1_of_genarray @@
+ Parmap_compat.map_file fd Bigarray.char Bigarray.c_layout true [|-1|] in
let res = Bytearray.unmarshal a 0 in
Unix.close fd;
res
@@ -124,8 +125,9 @@
- on Linux kernels, we might allocate a mmapped memory area of huge_size
and marshal into it directly
- let ba = Bigarray.Array1.map_file
- fd Bigarray.char Bigarray.c_layout true huge_size in
+ let ba =
+ Bigarray.array1_of_genarray @@
+ Parmap_compat.map_file fd Bigarray.char Bigarray.c_layout true
huge_size in
ignore(Bytearray.marshal_to_buffer ba 0 v [Marshal.Closures]);
Unix.close fd
@@ -624,7 +626,8 @@
let size = Array.length a in
let fd = Utils.tempfd() in
let arr =
- Bigarray.Array1.map_file fd Bigarray.float64 Bigarray.c_layout true size in
+ Bigarray.array1_of_genarray @@
+ Parmap_compat.map_file fd Bigarray.float64 Bigarray.c_layout true [|size|]
in
(* The mmap() function shall add an extra reference to the file associated
with the file descriptor fildes which is not removed by a subsequent
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-parmap-20190330.8d19c66/parmap.mldylib
new/ocaml-parmap-20191002.803edbb/parmap.mldylib
--- old/ocaml-parmap-20190330.8d19c66/parmap.mldylib 2019-03-30
17:57:21.000000000 +0100
+++ new/ocaml-parmap-20191002.803edbb/parmap.mldylib 2019-10-02
05:02:01.000000000 +0200
@@ -1,4 +1,5 @@
Parmap
Bytearray
+Parmap_compat
Parmap_utils
Setcore
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-parmap-20190330.8d19c66/parmap.mllib
new/ocaml-parmap-20191002.803edbb/parmap.mllib
--- old/ocaml-parmap-20190330.8d19c66/parmap.mllib 2019-03-30
17:57:21.000000000 +0100
+++ new/ocaml-parmap-20191002.803edbb/parmap.mllib 2019-10-02
05:02:01.000000000 +0200
@@ -1,4 +1,5 @@
Parmap
Bytearray
+Parmap_compat
Parmap_utils
Setcore
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-parmap-20190330.8d19c66/parmap.opam
new/ocaml-parmap-20191002.803edbb/parmap.opam
--- old/ocaml-parmap-20190330.8d19c66/parmap.opam 1970-01-01
01:00:00.000000000 +0100
+++ new/ocaml-parmap-20191002.803edbb/parmap.opam 2019-10-02
05:02:01.000000000 +0200
@@ -0,0 +1,43 @@
+opam-version: "2.0"
+maintainer: "Roberto Di Cosmo <robe...@dicosmo.org>"
+authors: "Roberto Di Cosmo <robe...@dicosmo.org>"
+homepage: "https://github.com/rdicosmo/parmap";
+dev-repo: "git+https://github.com/rdicosmo/parmap.git";
+bug-reports: "https://github.com/rdicosmo/parmap/issues";
+build: [
+ ["aclocal" "-I" "m4"]
+ ["autoconf"]
+ ["autoheader"]
+ ["./configure"]
+ [make "DESTDIR=%{prefix}%" "OCAMLLIBDIR=lib" ]
+]
+install: [
+ [make "install" "DESTDIR=%{prefix}%" "OCAMLLIBDIR=lib"]
+]
+remove: [
+ ["aclocal" "-I" "m4"]
+ ["autoconf"]
+ ["autoheader"]
+ ["./configure"]
+ [make "uninstall" "DESTDIR=%{prefix}%" "OCAMLLIBDIR=lib"]
+]
+depends: [
+ "ocaml"
+ "ocamlfind" {build}
+ "ocamlbuild" {build}
+ "conf-autoconf"
+ "conf-aclocal"
+]
+synopsis: "Minimalistic library allowing to exploit multicore architecture"
+description: """
+Parmap is a minimalistic library allowing to exploit multicore
+architecture for OCaml programs with minimal modifications: if you
+want to use your many cores to accelerate an operation which happens
+to be a map, fold or map/fold (map-reduce), just use Parmap’s parmap,
+parfold and parmapfold primitives in place of the standard List.map
+and friends, and specify the number of subprocesses to use by the
+optional parameter ~ncores."""
+#url {
+# src: "https://github.com/rdicosmo/parmap/archive/1.0-rc10.tar.gz";
+# checksum: "md5=399676835637c4af5835223d721c7d0f"
+#}
