Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Just a 'bureaucratic' update (jbuilder -> dune, opam -> opam 2.0) #2

Merged
merged 6 commits into from
May 2, 2020
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.PHONY : run
run :
jbuilder build --dev tester/tester.exe reporter/reporter.exe
dune build --profile=dev tester/tester.exe reporter/reporter.exe
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think --profile=dev could just be dropped, since it is the default.

mkdir -p _report
_build/default/tester/tester.exe -ascii -quota 10 > _report/core_bench.txt
_build/default/reporter/reporter.exe \
Expand All @@ -9,15 +9,15 @@ run :

.PHONY : test-correctness
test-correctness :
jbuilder build --dev correctness/correctness.exe
dune build --profile=dev correctness/correctness.exe
_build/default/correctness/correctness.exe

MEMORY_TESTS := $(shell ls memory/*/test.ml)
MEMORY_TESTS := $(MEMORY_TESTS:.ml=.exe)

.PHONY : compare-memory-usage
compare-memory-usage :
jbuilder build --dev $(MEMORY_TESTS)
dune build --profile=dev $(MEMORY_TESTS)
@echo "map stack heap total"
@for TEST in $(MEMORY_TESTS) ; \
do \
Expand All @@ -32,5 +32,5 @@ depend :

.PHONY : clean
clean :
jbuilder clean
dune clean
rm -rf _report
4 changes: 4 additions & 0 deletions correctness/dune
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
(executable
(name correctness)
(flags :standard -w +A)
(libraries faster-map.functions))
6 changes: 0 additions & 6 deletions correctness/jbuild

This file was deleted.

2 changes: 2 additions & 0 deletions dune-project
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
(lang dune 1.0)
(name faster-map)
9 changes: 7 additions & 2 deletions faster-map.opam
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
opam-version: "1.2"
opam-version: "2.0"
synopsis: "A tail-recursive list map with good performance for all list sizes. Not actually written in assembly"
authors: "<Anton Bachin> antonbachin@yahoo.com"
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IIRC this is should be name <email>, not <name> email.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks.

maintainer: "<Anton Bachin> antonbachin@yahoo.com"
homepage: "https://github.com/aantron/faster-map"
bug-reports: "https://github.com/aantron/faster-map/issues"

depends: [
"base"
"batteries"
"containers"
"core_bench"
"jbuilder" {build & >= "1.0+beta13"}
"dune" {build & >= "1.0"}
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dune should be a non-build dependency. See ocaml/opam-repository#14266.

]
18 changes: 18 additions & 0 deletions functions/dune
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
; Example output of the generator can be found in results/faster_map.ml. That is
; basically a dumped and commented generated.ml.

(rule
(targets generated.ml)
(deps
(:< %{workspace_root}/generator/generator.exe))
(action
(with-stdout-to
%{targets}
(run %{<}))))

(library
(name functions)
(public_name faster-map.functions)
(flags :standard -w +A)
(ocamlopt_flags :standard -O3)
(libraries base batteries containers))
15 changes: 0 additions & 15 deletions functions/jbuild

This file was deleted.

3 changes: 3 additions & 0 deletions generator/dune
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
(executable
(name generator)
(flags :standard -w +A))
5 changes: 0 additions & 5 deletions generator/jbuild

This file was deleted.

5 changes: 5 additions & 0 deletions memory/base/dune
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
(executable
(name test)
(flags :standard -w +A)
(ocamlopt_flags :standard -O3)
(libraries faster-map.instrumented))
1 change: 0 additions & 1 deletion memory/base/jbuild

This file was deleted.

5 changes: 5 additions & 0 deletions memory/batteries/dune
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
(executable
(name test)
(flags :standard -w +A)
(ocamlopt_flags :standard -O3)
(libraries faster-map.instrumented))
1 change: 0 additions & 1 deletion memory/batteries/jbuild

This file was deleted.

5 changes: 5 additions & 0 deletions memory/containers/dune
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
(executable
(name test)
(flags :standard -w +A)
(ocamlopt_flags :standard -O3)
(libraries faster-map.instrumented))
1 change: 0 additions & 1 deletion memory/containers/jbuild

This file was deleted.

5 changes: 5 additions & 0 deletions memory/dune
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
(library
(name instrumented)
(public_name faster-map.instrumented)
(flags :standard -w +A)
(ocamlopt_flags :standard -O3))
7 changes: 0 additions & 7 deletions memory/jbuild

This file was deleted.

5 changes: 5 additions & 0 deletions memory/naive/dune
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
(executable
(name test)
(flags :standard -w +A)
(ocamlopt_flags :standard -O3)
(libraries faster-map.instrumented))
1 change: 0 additions & 1 deletion memory/naive/jbuild

This file was deleted.

5 changes: 5 additions & 0 deletions memory/proposed/dune
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
(executable
(name test)
(flags :standard -w +A)
(ocamlopt_flags :standard -O3)
(libraries faster-map.instrumented))
1 change: 0 additions & 1 deletion memory/proposed/jbuild

This file was deleted.

5 changes: 5 additions & 0 deletions memory/stdlib/dune
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
(executable
(name test)
(flags :standard -w +A)
(ocamlopt_flags :standard -O3)
(libraries faster-map.instrumented))
1 change: 0 additions & 1 deletion memory/stdlib/jbuild

This file was deleted.

5 changes: 5 additions & 0 deletions memory/unrolled/dune
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
(executable
(name test)
(flags :standard -w +A)
(ocamlopt_flags :standard -O3)
(libraries faster-map.instrumented))
1 change: 0 additions & 1 deletion memory/unrolled/jbuild

This file was deleted.

3 changes: 3 additions & 0 deletions reporter/dune
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
(executable
(name reporter)
(flags :standard -w +A))
5 changes: 0 additions & 5 deletions reporter/jbuild

This file was deleted.

5 changes: 5 additions & 0 deletions tester/dune
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
(executable
(name tester)
(flags :standard -w +A)
(ocamlopt_flags :standard -O3)
(libraries core_bench faster-map.functions))
7 changes: 0 additions & 7 deletions tester/jbuild

This file was deleted.