Pin dune and base to work around ocaml trunk changes

ocaml-bench / sandmark

A benchmark suite for the OCaml compiler

The Unlicense

82 stars 40 forks source link

Pin dune and base to work around ocaml trunk changes #472

Closed punchagan closed 2 months ago

punchagan commented 2 months ago

The primary changes in this PR are:

Pin base to workaround Format_doc change (see commit message)
Pin dune to workaround splitting native and bytecode compiler flags (see commit message)

The PR also has other small changes:

upgrades dune to latest version
Switches OCaml 5.2.0 to 5.2.1
Fixes broken notebook tests by pinning Python dependencies
Disable sys dune hack for nightly builds

punchagan commented 2 months ago

CI for OCaml 5.3 is expected to fail due to #471

punchagan commented 2 months ago

Pushed a couple of new commits to use a patched version of dune to work around the changes in https://github.com/ocaml/ocaml/pull/13201 where the compiler flags for bytecode and native compilers have been separated out, and name prefixes have been changed to bytecode_ and native_ from ocamlc_ and ocamlopt_.

punchagan commented 2 months ago

@shakthimaan is my understanding correct that dune would previously not compile against multicore branch and USE_SYS_DUNE_HACK was required? It seems okay to me to disable this hack and use a patched version of dune. Can you please confirm with a review? Thanks!

shakthimaan commented 2 months ago

Sure. It will be good to decide on LTS and whether you need to support earlier versions. Otherwise, it is better to upgrade.

punchagan commented 2 months ago

Makes sense. I guess we could make the "use_sys_dune" an option in the configuration files, if we'd like to support older versions alongside the current versions. I've not removed the USE_SYS_DUNE_HACK option in this PR, but will discuss and plan on removing it vs supporting it as a config option.

punchagan commented 2 months ago

Deployed run_all_custom.sh script to navajo. Remote login to turing fails - deployment pending.

punchagan commented 2 months ago

Builds on navajo are running again!