diff --git a/Makefile b/Makefile index 4ec0de8300..8701d22d49 100644 --- a/Makefile +++ b/Makefile @@ -66,7 +66,7 @@ START_TIME ?= WRAPPER = $(patsubst run_%,%,$(RUN_BENCH_TARGET)) -PACKAGES = owl npy sexplib0 re yojson react uuidm cpdf nbcodec minilight cubicle orun rungen +PACKAGES = owl sexplib0 re yojson react uuidm cpdf nbcodec minilight cubicle orun rungen ifeq ($(findstring multibench,$(BUILD_BENCH_TARGET)),multibench) PACKAGES += lockfree kcas domainslib ctypes @@ -144,6 +144,7 @@ _opam/%: _opam/opam-init/init.sh ocaml-versions/%.json opam pin add -n --yes --switch $* ocamlfind https://github.com/dra27/ocamlfind/archive/lib-layout.tar.gz opam pin add -n --yes --switch $* ocplib-endian https://github.com/kit-ty-kate/ocplib-endian/archive/500.tar.gz opam pin add -n --yes --switch $* owl https://github.com/Sudha247/owl.git#500 + opam pin add -n --yes --switch $* owl-base https://github.com/Sudha247/owl.git#500 override_packages/%: setup_sys_dune/% $(eval CONFIG_SWITCH_NAME = $*) diff --git a/benchmarks/owl/dune b/benchmarks/owl/dune index 64a1b25d4c..25b4668298 100644 --- a/benchmarks/owl/dune +++ b/benchmarks/owl/dune @@ -1,6 +1,6 @@ (executable (name test_owl) - (libraries owl)) + (libraries owl owl-base)) (alias (name buildbench) diff --git a/dependencies/packages/base/base.v0.15.0/opam b/dependencies/packages/base/base.v0.15.0/opam deleted file mode 100644 index 339a624a73..0000000000 --- a/dependencies/packages/base/base.v0.15.0/opam +++ /dev/null @@ -1,36 +0,0 @@ -opam-version: "2.0" -maintainer: "Jane Street developers" -authors: ["Jane Street Group, LLC"] -homepage: "https://github.com/janestreet/base" -bug-reports: "https://github.com/janestreet/base/issues" -dev-repo: "git+https://github.com/janestreet/base.git" -doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/base/index.html" -license: "MIT" -build: [ - ["dune" "build" "-p" name "-j" jobs] -] -depends: [ - "ocaml" {>= "4.10.0"} - "sexplib0" {>= "v0.15" & < "v0.16"} - "dune" {>= "2.0.0"} - "dune-configurator" -] -synopsis: "Full standard library replacement for OCaml" -description: " -Full standard library replacement for OCaml - -Base is a complete and portable alternative to the OCaml standard -library. It provides all standard functionalities one would expect -from a language standard library. It uses consistent conventions -across all of its module. - -Base aims to be usable in any context. As a result system dependent -features such as I/O are not offered by Base. They are instead -provided by companion libraries such as stdio: - - https://github.com/janestreet/stdio -" -url { -src: "https://ocaml.janestreet.com/ocaml-core/v0.15/files/base-v0.15.0.tar.gz" -checksum: "sha256=8657ae4324a9948457112245c49d97d2da95f157f780f5d97f0b924312a6a53d" -} diff --git a/dependencies/packages/eigen/eigen.0.4.0/opam b/dependencies/packages/eigen/eigen.0.4.0/opam deleted file mode 100644 index 33f7c000f9..0000000000 --- a/dependencies/packages/eigen/eigen.0.4.0/opam +++ /dev/null @@ -1,29 +0,0 @@ -opam-version: "2.0" -maintainer: "Liang Wang " -authors: [ "Liang Wang" ] -license: "MIT" -homepage: "https://github.com/owlbarn/eigen" -dev-repo: "git+https://github.com/owlbarn/eigen.git" -bug-reports: "https://github.com/owlbarn/eigen/issues" -doc: "https://owlbarn.github.io/eigen/eigen" -build: [ - ["dune" "build" "-p" name "-j" jobs] -] -depends: [ - "ocaml" {>= "4.02"} - "ctypes" {>= "0.14.0"} - "dune" {>= "2.0.0"} -] -available: false -synopsis: "Owl's OCaml interface to Eigen3 C++ library" -description: -"Eigen is a thin OCaml interface to Eigen3 C++ template library used in Owl to provide basic numerical support for both sparse and dense matrix operations." -x-commit-hash: "6f7963e969df5b6b416b71f6a57c8a867c59edec" -url { - src: - "https://github.com/owlbarn/eigen/releases/download/0.4.0/eigen-0.4.0.tbz" - checksum: [ - "sha256=475711ea51055bc6cec90c4376c8e7eb978387e16849cd1f73f41ef76dc332b4" - "sha512=076cbf1e71b955fcaa54d2c6feb34cb34c20838706c724238e2ce00c6e4ece65b0ca9e5e613f35438baddfc13b5bbec474e4489d1aab835514efca6eee36a014" - ] -} diff --git a/dependencies/packages/odoc/odoc.2.1.0/opam b/dependencies/packages/odoc/odoc.2.1.0/opam deleted file mode 100644 index 79b31f7705..0000000000 --- a/dependencies/packages/odoc/odoc.2.1.0/opam +++ /dev/null @@ -1,60 +0,0 @@ -opam-version: "2.0" -homepage: "http://github.com/ocaml/odoc" -doc: "https://ocaml.github.io/odoc/" -bug-reports: "https://github.com/ocaml/odoc/issues" -license: "ISC" - -authors: [ - "Thomas Refis " - "David Sheets " - "Leo White " - "Anton Bachin " - "Jon Ludlam " - "Jules Aguillon " - "Lubega Simon " -] -maintainer: "Jon Ludlam " -dev-repo: "git+https://github.com/ocaml/odoc.git" - -synopsis: "OCaml documentation generator" -description: """ -Odoc is a documentation generator for OCaml. It reads doc comments, -delimited with `(** ... *)`, and outputs HTML. -""" - -depends: [ - "odoc-parser" {>= "0.9.0"} - "astring" - "cmdliner" {>= "1.0.0"} - "cppo" {build & >= "1.1.0"} - "dune" {>= "2.9.1"} - "fpath" - "ocaml" {>= "4.02.0"} - "result" - "tyxml" {>= "4.3.0"} - "fmt" - - "ocamlfind" {with-test} - "yojson" {with-test} - ("ocaml" {< "4.04.1" & with-test} | "sexplib0" {with-test}) - "conf-jq" {with-test} - - "ppx_expect" {with-test} - "bos" {with-test} - - "bisect_ppx" {dev & > "2.5.0"} - ("ocaml" {< "4.03.0" & dev} | "mdx" {dev}) -] - -build: [ - ["dune" "subst"] {dev} - ["dune" "build" "-p" name "-j" jobs] -] -url { - src: "https://github.com/ocaml/odoc/releases/download/2.1.0/odoc-2.1.0.tbz" - checksum: [ - "sha256=65a2523a50ee368164f1f24f75866a6a36cdb0d00039c3006ec824351d4e4967" - "sha512=cf4d7e884b94a9b9c4bcb62d4423d7289d7bbbf2642c5eacf9577b76eb835cf6ecc79d2384d36d174d2e9d8f758b5082c0c4bf8f66b5c6db4e9805dc3fc9ee1a" - ] -} -x-commit-hash: "d654ee2a4ff3e1465dcf92b882c26de71f7a9986" \ No newline at end of file diff --git a/run_config.json b/run_config.json index c619e9baa1..55df167157 100644 --- a/run_config.json +++ b/run_config.json @@ -1,5 +1,4 @@ -{ - "wrappers": [ +{ "wrappers": [ { "name": "orun", "command": "orun -o %{output} -- taskset --cpu-list 5 %{command}"