From 1e998f87abd2ab16a203ec669f0715c5e62b4e268310afb3ac88b6b0da5b0da6 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 28 Jan 2020 19:45:55 +0000 Subject: [PATCH 1/3] - Update to version 20200123.d9bcb31. (1.1) OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-parmap?expand=0&rev=44 --- _service | 4 ++-- ocaml-parmap-20191021.1b17a5d.tar.xz | 3 --- ocaml-parmap-20200123.d9bcb31.tar.xz | 3 +++ ocaml-parmap.changes | 5 +++++ ocaml-parmap.spec | 2 +- x.patch | 15 +++++++++++++++ 6 files changed, 26 insertions(+), 6 deletions(-) delete mode 100644 ocaml-parmap-20191021.1b17a5d.tar.xz create mode 100644 ocaml-parmap-20200123.d9bcb31.tar.xz create mode 100644 x.patch diff --git a/_service b/_service index fbc2ac2..bf686e0 100644 --- a/_service +++ b/_service @@ -1,9 +1,9 @@ ocaml-parmap - dune-wip + d9bcb31921e68eba88e798a68fc366c88c688c36 git - https://github.com/olafhering/ocaml-parmap.git + https://github.com/rdicosmo/parmap.git %cd.%h diff --git a/ocaml-parmap-20191021.1b17a5d.tar.xz b/ocaml-parmap-20191021.1b17a5d.tar.xz deleted file mode 100644 index fca431c..0000000 --- a/ocaml-parmap-20191021.1b17a5d.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0a433c605c2845a0e1d07af83e14384f59d01b3f646cabaaa8e56aa7d515d262 -size 31620 diff --git a/ocaml-parmap-20200123.d9bcb31.tar.xz b/ocaml-parmap-20200123.d9bcb31.tar.xz new file mode 100644 index 0000000..f935a04 --- /dev/null +++ b/ocaml-parmap-20200123.d9bcb31.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3696df4fdaa20c696a3458e3c33870c3694455733533b783caaf4bfad05a5e64 +size 31228 diff --git a/ocaml-parmap.changes b/ocaml-parmap.changes index 538aaf5..39e58b9 100644 --- a/ocaml-parmap.changes +++ b/ocaml-parmap.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jan 28 18:19:20 UTC 2020 - ohering@suse.de + +- Update to version 20200123.d9bcb31. (1.1) + ------------------------------------------------------------------- Fri Nov 1 12:34:56 UTC 2019 - ohering@suse.de diff --git a/ocaml-parmap.spec b/ocaml-parmap.spec index 11ec70c..09ecfc6 100644 --- a/ocaml-parmap.spec +++ b/ocaml-parmap.spec @@ -17,7 +17,7 @@ Name: ocaml-parmap -Version: 20191021.1b17a5d +Version: 20200123.d9bcb31 Release: 0 %{?ocaml_preserve_bytecode} Summary: Multicore architecture exploitation for OCaml programs with minimal modifications diff --git a/x.patch b/x.patch new file mode 100644 index 0000000..95d0d10 --- /dev/null +++ b/x.patch @@ -0,0 +1,15 @@ +--- a/tests/floatscale.ml ++++ b/tests/floatscale.ml +@@ -30,7 +30,11 @@ let env_string = env_param (fun x -> x) + + let nIters = env_int "nIters" 1 + +-let nData = env_int "nData" 10000000 ++let nData_default = ++ let default = 10000000 in ++ min (Sys.max_array_length / 2) default ++ ++let nData = env_int "nData" nData_default + + let nProcs = env_int "nProcs" 8 + From d9ed7425503f4bce98ca64aefe61d59c0c1385ed8c7b6fdb477c85706bc61729 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Thu, 6 Feb 2020 16:18:01 +0000 Subject: [PATCH 2/3] - Update to version 20200124.526acc4 (1.1.1) OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-parmap?expand=0&rev=45 --- _service | 2 +- ocaml-parmap-20200123.d9bcb31.tar.xz | 3 --- ocaml-parmap-20200124.526acc4.tar.xz | 3 +++ ocaml-parmap.changes | 4 ++-- ocaml-parmap.spec | 3 +-- x.patch | 15 --------------- 6 files changed, 7 insertions(+), 23 deletions(-) delete mode 100644 ocaml-parmap-20200123.d9bcb31.tar.xz create mode 100644 ocaml-parmap-20200124.526acc4.tar.xz delete mode 100644 x.patch diff --git a/_service b/_service index bf686e0..2bf920b 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ ocaml-parmap - d9bcb31921e68eba88e798a68fc366c88c688c36 + 526acc4d2dd0f8949dfd53fa1ff015307c970899 git https://github.com/rdicosmo/parmap.git %cd.%h diff --git a/ocaml-parmap-20200123.d9bcb31.tar.xz b/ocaml-parmap-20200123.d9bcb31.tar.xz deleted file mode 100644 index f935a04..0000000 --- a/ocaml-parmap-20200123.d9bcb31.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3696df4fdaa20c696a3458e3c33870c3694455733533b783caaf4bfad05a5e64 -size 31228 diff --git a/ocaml-parmap-20200124.526acc4.tar.xz b/ocaml-parmap-20200124.526acc4.tar.xz new file mode 100644 index 0000000..6d251dc --- /dev/null +++ b/ocaml-parmap-20200124.526acc4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e73a703e0293484594254ac004f78aee618dbbd13be71f6e5e8dc223c7fe2110 +size 31236 diff --git a/ocaml-parmap.changes b/ocaml-parmap.changes index 39e58b9..cb2e5b5 100644 --- a/ocaml-parmap.changes +++ b/ocaml-parmap.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- -Tue Jan 28 18:19:20 UTC 2020 - ohering@suse.de +Thu Feb 6 16:16:16 UTC 2020 - ohering@suse.de -- Update to version 20200123.d9bcb31. (1.1) +- Update to version 20200124.526acc4 (1.1.1) ------------------------------------------------------------------- Fri Nov 1 12:34:56 UTC 2019 - ohering@suse.de diff --git a/ocaml-parmap.spec b/ocaml-parmap.spec index 09ecfc6..e3a1673 100644 --- a/ocaml-parmap.spec +++ b/ocaml-parmap.spec @@ -17,7 +17,7 @@ Name: ocaml-parmap -Version: 20200123.d9bcb31 +Version: 20200124.526acc4 Release: 0 %{?ocaml_preserve_bytecode} Summary: Multicore architecture exploitation for OCaml programs with minimal modifications @@ -76,7 +76,6 @@ export nProcs=2 %ocaml_dune_test %files -f %{name}.files -%{_bindir}/* %files devel -f %{name}.files.devel diff --git a/x.patch b/x.patch deleted file mode 100644 index 95d0d10..0000000 --- a/x.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/tests/floatscale.ml -+++ b/tests/floatscale.ml -@@ -30,7 +30,11 @@ let env_string = env_param (fun x -> x) - - let nIters = env_int "nIters" 1 - --let nData = env_int "nData" 10000000 -+let nData_default = -+ let default = 10000000 in -+ min (Sys.max_array_length / 2) default -+ -+let nData = env_int "nData" nData_default - - let nProcs = env_int "nProcs" 8 - From 032fed9bfddbaba4aa138903386252510d0d09b8370a23dcd0e1180c8ec70673 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Fri, 21 Feb 2020 12:08:16 +0000 Subject: [PATCH 3/3] - Require current ocaml-rpm-macros merged our changes for dune and recent ocaml versions OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-parmap?expand=0&rev=46 --- ocaml-parmap.changes | 4 +++- ocaml-parmap.spec | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ocaml-parmap.changes b/ocaml-parmap.changes index cb2e5b5..cc2d687 100644 --- a/ocaml-parmap.changes +++ b/ocaml-parmap.changes @@ -1,7 +1,9 @@ ------------------------------------------------------------------- -Thu Feb 6 16:16:16 UTC 2020 - ohering@suse.de +Thu Feb 20 20:20:20 UTC 2020 - ohering@suse.de +- Require current ocaml-rpm-macros - Update to version 20200124.526acc4 (1.1.1) + merged our changes for dune and recent ocaml versions ------------------------------------------------------------------- Fri Nov 1 12:34:56 UTC 2019 - ohering@suse.de diff --git a/ocaml-parmap.spec b/ocaml-parmap.spec index e3a1673..af30b81 100644 --- a/ocaml-parmap.spec +++ b/ocaml-parmap.spec @@ -27,7 +27,7 @@ URL: http://rdicosmo.github.io/parmap/ Source: %{name}-%{version}.tar.xz BuildRequires: ocaml BuildRequires: ocaml-dune -BuildRequires: ocaml-rpm-macros >= 20191101 +BuildRequires: ocaml-rpm-macros >= 20200220 BuildRequires: ocamlfind(bigarray) BuildRequires: ocamlfind(dune.configurator) BuildRequires: ocamlfind(graphics)