Fixes #259: break up dependency on ppx_jane

lukstafi · lukstafi · commit 067169f18edd · 2024-10-19T16:36:36.000+02:00
diff --git a/CHANGES.md b/CHANGES.md
@@ -16,7 +16,7 @@
 - Moved the multicore backend from a `device = stream` model to a single device model.
 - Got rid of `unsafe_cleanup`.
 - Got rid of `subordinal`.
-- Removed dependency on `Core`.
+- Removed dependency on `dore`, broke up dependency on `ppx_jane`.
 - TODO: Built per-tensor-node stream-to-stream synchronization into device-to-device copying functions, removed obsolete blocking synchronizations.
 
 ### Fixed
diff --git a/arrayjit.opam b/arrayjit.opam
@@ -22,10 +22,16 @@ depends: [
   "printbox-text"
   "ocannl_npy"
   "stdio"
+  "sexplib"
   "num"
   "saturn_lockfree" {>= "0.5.0"}
   "ppxlib"
-  "ppx_jane"
+  "ppx_compare"
+  "ppx_hash"
+  "ppx_here"
+  "ppx_sexp_conv"
+  "ppx_string"
+  "ppx_variants_conv"
   "ppx_expect"
   "ppx_minidebug" {>= "2.0.0"}
   "odoc" {with-doc}
diff --git a/arrayjit/lib/dune b/arrayjit/lib/dune
@@ -7,6 +7,7 @@
   printbox-text
   npy
   stdio
+  sexplib
   str
   ctypes
   ctypes.foreign
@@ -23,7 +24,7 @@
    (-> cuda_backend.missing.ml))
   ppx_minidebug.runtime)
  (preprocess
-  (pps ppx_jane ppx_minidebug))
+  (pps ppx_compare ppx_hash ppx_here ppx_sexp_conv ppx_string ppx_variants_conv ppx_minidebug))
  (modules
   utils
   rand
@@ -48,4 +49,4 @@
  (modules ppx_helper)
  (libraries base ppxlib str)
  (preprocess
-  (pps ppx_jane ppxlib.metaquot)))
+  (pps ppxlib.metaquot)))
diff --git a/bin/dune b/bin/dune
@@ -3,7 +3,7 @@
  (modules hello_world)
  (libraries ocannl base stdio)
  (preprocess
-  (pps ppx_jane ppx_ocannl))
+  (pps ppx_ocannl))
  (modes exe))
 
 (executable
@@ -12,63 +12,63 @@
  (public_name ocannl)
  (name moons_benchmark)
  (modules moons_benchmark)
- (libraries ocannl base stdio)
+ (libraries ocannl base stdio time_now)
  (preprocess
-  (pps ppx_jane ppx_ocannl ppx_minidebug))
+  (pps ppx_here ppx_sexp_conv ppx_string ppx_ocannl ppx_minidebug))
  (modes exe))
 
 (executable
  (name compilation_speed)
  (modules compilation_speed)
- (libraries ocannl base stdio)
+ (libraries ocannl base stdio time_now)
  (preprocess
-  (pps ppx_jane ppx_ocannl))
+  (pps ppx_sexp_conv ppx_ocannl))
  (modes exe))
 
 (executable
  (name einsum_trivia)
  (modules einsum_trivia)
  (libraries ocannl base stdio)
  (preprocess
-  (pps ppx_jane ppx_ocannl))
+  (pps ppx_ocannl))
  (modes exe))
 
 (executable
  (name zero2hero_1of7)
  (modules zero2hero_1of7)
  (libraries ocannl base stdio)
  (preprocess
-  (pps ppx_jane ppx_ocannl ppx_minidebug))
+  (pps ppx_here ppx_ocannl ppx_minidebug))
  (modes exe))
 
 (executable
  (name micrograd_basic)
  (modules micrograd_basic)
  (libraries ocannl base stdio)
  (preprocess
-  (pps ppx_jane ppx_ocannl ppx_minidebug))
+  (pps ppx_ocannl ppx_minidebug))
  (modes exe))
 
 (executable
  (name micrograd_demo)
  (modules micrograd_demo)
  (libraries ocannl base stdio)
  (preprocess
-  (pps ppx_jane ppx_ocannl ppx_minidebug))
+  (pps ppx_sexp_conv ppx_ocannl ppx_minidebug))
  (modes exe))
 
 (executable
  (name moons_demo)
  (modules moons_demo)
  (libraries ocannl base stdio)
  (preprocess
-  (pps ppx_jane ppx_ocannl ppx_minidebug))
+  (pps ppx_sexp_conv ppx_ocannl ppx_minidebug))
  (modes exe))
 
 (executable
  (name moons_demo_parallel)
  (modules moons_demo_parallel)
  (libraries ocannl base stdio)
  (preprocess
-  (pps ppx_jane ppx_ocannl))
+  (pps ppx_ocannl))
  (modes exe))
diff --git a/dune-project b/dune-project
@@ -64,11 +64,17 @@
   printbox-text
   ocannl_npy
   stdio
+  sexplib
   num
   (saturn_lockfree
    (>= 0.5.0))
   ppxlib
-  ppx_jane
+  ppx_compare
+  ppx_hash
+  ppx_here
+  ppx_sexp_conv
+  ppx_string
+  ppx_variants_conv
   ppx_expect
   (ppx_minidebug
    (>= 2.0.0)))
@@ -110,9 +116,17 @@
   (angstrom
    (>= 0.15))
   stdio
+  sexplib
   num
+  time_now
   ppxlib
-  ppx_jane
+  ppx_compare
+  ppx_fields_conv
+  ppx_hash
+  ppx_here
+  ppx_sexp_conv
+  ppx_string
+  ppx_variants_conv
   ppx_expect
   (ppx_minidebug
    (>= 2.0.0))
diff --git a/lib/dune b/lib/dune
@@ -8,13 +8,23 @@
   npy
   angstrom
   stdio
+  sexplib
   num
   str
   ; mem_usage
   ppx_minidebug.runtime
   arrayjit)
  (preprocess
-  (pps ppx_jane ppx_ocannl ppx_minidebug))
+  (pps
+   ppx_compare
+   ppx_fields_conv
+   ppx_hash
+   ppx_here
+   ppx_sexp_conv
+   ppx_string
+   ppx_variants_conv
+   ppx_ocannl
+   ppx_minidebug))
  (modules PrintBox_utils row shape tensor operation train nn_blocks)
  (modes byte native)
  (c_library_flags -pthread))
@@ -26,4 +36,4 @@
  (modules ppx_shared ppx_cd ppx_op ppx_ocannl)
  (libraries base ppxlib str ppx_arrayjit)
  (preprocess
-  (pps ppx_jane ppxlib.metaquot)))
+  (pps ppxlib.metaquot)))
diff --git a/neural_nets_lib.opam b/neural_nets_lib.opam
@@ -22,9 +22,17 @@ depends: [
   "ocannl_npy"
   "angstrom" {>= "0.15"}
   "stdio"
+  "sexplib"
   "num"
+  "time_now"
   "ppxlib"
-  "ppx_jane"
+  "ppx_compare"
+  "ppx_fields_conv"
+  "ppx_hash"
+  "ppx_here"
+  "ppx_sexp_conv"
+  "ppx_string"
+  "ppx_variants_conv"
   "ppx_expect"
   "ppx_minidebug" {>= "2.0.0"}
   "patdiff" {>= "v0.15.0"}
diff --git a/test/dune b/test/dune
@@ -7,7 +7,7 @@
  (deps ocannl_config)
  (libraries ocannl)
  (preprocess
-  (pps ppx_jane ppx_ocannl)))
+  (pps ppx_ocannl)))
 
 (library
  (name tutorials)
@@ -22,5 +22,5 @@
   zero2hero_1of7
   moons_demo_parallel)
  (preprocess
-  (pps ppx_jane ppx_expect ppx_inline_test ppx_ocannl))
+  (pps ppx_here ppx_expect ppx_inline_test ppx_ocannl))
  (modes native))
