From 7df23d0ccaf9e9d36455f8ca1a2db959e6e1f868 Mon Sep 17 00:00:00 2001 From: Simon Cruanes Date: Sun, 21 Jan 2018 17:09:30 -0600 Subject: [PATCH] fix build for benchs --- Makefile | 4 ++-- benchs/jbuild | 2 +- benchs/run_benchs.ml | 14 -------------- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index 446c0f41..1d9c7cb6 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ doc: BENCH_TARGETS=run_benchs.exe run_bench_hash.exe benchs: - jbuilder build $(addprefix bench/, $(BENCH_TARGETS)) + jbuilder build $(addprefix benchs/, $(BENCH_TARGETS)) examples: jbuilder build examples/id_sexp.exe @@ -39,4 +39,4 @@ reindent: @find src '(' -name '*.ml' -or -name '*.mli' ')' -type f -print0 | xargs -0 echo "reindenting: " @find src '(' -name '*.ml' -or -name '*.mli' ')' -type f -print0 | xargs -0 ocp-indent -i -.PHONY: all test clean build doc update_next_tag watch +.PHONY: all benchs test clean build doc update_next_tag watch diff --git a/benchs/jbuild b/benchs/jbuild index 82853950..957f0ed2 100644 --- a/benchs/jbuild +++ b/benchs/jbuild @@ -2,7 +2,7 @@ (executables ((names (run_benchs run_bench_hash)) (libraries (containers containers.data containers.iter - containers.thread benchmark gen sequence)) + containers.thread benchmark gen sequence qcheck)) (flags (:standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string -color always)) (ocamlopt_flags (:standard -O3 -color always -unbox-closures -unbox-closures-factor 20)) diff --git a/benchs/run_benchs.ml b/benchs/run_benchs.ml index 4448b6a9..2891b06f 100644 --- a/benchs/run_benchs.ml +++ b/benchs/run_benchs.ml @@ -513,19 +513,6 @@ module Tbl = struct let module U = MUT_OF_IMMUT(T) in (module U : MUT with type key = a) - let flat_hashtbl = - let module T = CCFlatHashtbl.Make(CCInt) in - let module U = struct - type key = int - type 'a t = 'a T.t - let name = "ccflat_hashtbl" - let create = T.create - let find = T.find_exn - let add = T.add - let replace = T.add - end in - (module U : INT_MUT) - let trie : (module MUT with type key = string) = let module T = struct let name = "trie(string)" @@ -584,7 +571,6 @@ module Tbl = struct (* ; poly_hashtbl *) ; map Int ; wbt Int - ; flat_hashtbl ; hashtrie Int ; hashtrie_mut Int (* ; hamt Int *)