Merge pull request #28 from SoftVarE-Group/crane

Use crane
SoftVarE-Group · Jun 26, 2024 · af88aae · af88aae
2 parents d75ae0e + 59697e5
commit af88aae
Show file tree

Hide file tree

Showing 18 changed files with 324 additions and 468 deletions.
diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml
@@ -28,16 +28,15 @@ jobs:
           - double: aarch64-darwin
             runner: macos-latest
         variant:
-          - flake: all
+          - flake: ddnnife
             artifact: ''
-          - flake: all-d4
+          - flake: bundled-d4
             artifact: '-d4'
-        exclude:
-          - target: { double: x86_64-linux, runner: ubuntu-latest }
-            variant: { flake: all, artifact: '' }
         include:
-          - target: { double: x86_64-linux, runner: ubuntu-latest }
-            variant: { flake: ddnnife-static, artifact: '' }
+          - target: { double: x86_64-windows, runner: ubuntu-latest }
+            variant: { flake: ddnnife-windows, artifact: '' }
+          - target: { double: x86_64-windows, runner: ubuntu-latest }
+            variant: { flake: bundled-d4-windows, artifact: '-d4' }
     runs-on: ${{ matrix.target.runner }}
     steps:
       - name: Checkout
@@ -49,7 +48,7 @@ jobs:
       - name: Build
         run: nix build -L .#${{ matrix.variant.flake }}
       - name: Set interpreter
-        if: ${{ matrix.target.double == 'x86_64-linux' && matrix.variant.artifact == '-d4' }}
+        if: ${{ matrix.target.double == 'x86_64-linux' && matrix.variant.flake == 'bundled-d4' }}
         run: |
           cp -rL result output
           rm -rf result

diff --git a/.github/workflows/Portable.yaml b/.github/workflows/Portable.yaml
@@ -20,7 +20,7 @@ jobs:
       - name: Cache
         uses: DeterminateSystems/magic-nix-cache-action@v4
       - name: Bundle
-        run: nix bundle --bundler github:DavHau/nix-portable -o bundle .#all-d4
+        run: nix bundle --bundler github:DavHau/nix-portable -o bundle .#ddnnife-d4
       - name: Upload
         uses: actions/upload-artifact@v4
         with:

diff --git a/.github/workflows/Windows.yaml b/.github/workflows/Windows.yaml
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ddnnife/Cargo.toml b/ddnnife/Cargo.toml
@@ -28,7 +28,7 @@ tempfile = "3.10"
 workctl = "0.2"
 
 [target.'cfg(any(target_os = "linux", target_os = "macos", target_os = "windows"))'.dependencies]
-d4-oxide = { version = "0.3.0", optional = true }
+d4-oxide = { version = "0.4", optional = true }
 
 [dev-dependencies]
 assert_cmd = "2.0"

diff --git a/ddnnife/src/ddnnf/anomalies/config_creation.rs b/ddnnife/src/ddnnf/anomalies/config_creation.rs
@@ -492,11 +492,7 @@ mod test {
         }
 
         let auto1_samples = auto1
-            .uniform_random_sampling(
-                &mut [-546, 55, 646, -872, -873, 102, 23, 764, -1111],
-                1_000,
-                42,
-            )
+            .uniform_random_sampling(&[-546, 55, 646, -872, -873, 102, 23, 764, -1111], 1_000, 42)
             .unwrap();
         for sample in auto1_samples {
             assert!(auto1.sat(&sample));
@@ -511,37 +507,37 @@ mod test {
 
         // same seeding should yield same results, different seeding should (normally) yield different results
         assert_eq!(
-            vp9.uniform_random_sampling(&mut [], 100, 42),
-            vp9.uniform_random_sampling(&mut [], 100, 42)
+            vp9.uniform_random_sampling(&[], 100, 42),
+            vp9.uniform_random_sampling(&[], 100, 42)
         );
         assert_eq!(
-            vp9.uniform_random_sampling(&mut [23, 4, -17], 100, 99),
-            vp9.uniform_random_sampling(&mut [23, 4, -17], 100, 99),
+            vp9.uniform_random_sampling(&[23, 4, -17], 100, 99),
+            vp9.uniform_random_sampling(&[23, 4, -17], 100, 99),
         );
         assert_ne!(
-            vp9.uniform_random_sampling(&mut [38, 2, -14], 100, 99),
-            vp9.uniform_random_sampling(&mut [38, 2, -14], 100, 50),
+            vp9.uniform_random_sampling(&[38, 2, -14], 100, 99),
+            vp9.uniform_random_sampling(&[38, 2, -14], 100, 50),
         );
 
         assert_eq!(
-            auto1.uniform_random_sampling(&mut [], 100, 42),
-            auto1.uniform_random_sampling(&mut [], 100, 42)
+            auto1.uniform_random_sampling(&[], 100, 42),
+            auto1.uniform_random_sampling(&[], 100, 42)
         );
         assert_eq!(
             auto1.uniform_random_sampling(
-                &mut [-546, 55, 646, -872, -873, 102, 23, 764, -1111],
+                &[-546, 55, 646, -872, -873, 102, 23, 764, -1111],
                 100,
                 1970
             ),
             auto1.uniform_random_sampling(
-                &mut [-546, 55, 646, -872, -873, 102, 23, 764, -1111],
+                &[-546, 55, 646, -872, -873, 102, 23, 764, -1111],
                 100,
                 1970
             ),
         );
         assert_ne!(
-            auto1.uniform_random_sampling(&mut [11, 12, 13, -14, -15, -16], 100, 1),
-            auto1.uniform_random_sampling(&mut [11, 12, 13, -14, -15, -16], 100, 2)
+            auto1.uniform_random_sampling(&[11, 12, 13, -14, -15, -16], 100, 1),
+            auto1.uniform_random_sampling(&[11, 12, 13, -14, -15, -16], 100, 2)
         );
     }
 
@@ -550,18 +546,16 @@ mod test {
         let mut vp9: Ddnnf = build_ddnnf("tests/data/VP9_d4.nnf", Some(42));
         let mut auto1: Ddnnf = build_ddnnf("tests/data/auto1_d4.nnf", Some(2513));
 
-        assert!(vp9.uniform_random_sampling(&mut [1, -1], 1, 42).is_none());
+        assert!(vp9.uniform_random_sampling(&[1, -1], 1, 42).is_none());
         assert!(vp9
-            .uniform_random_sampling(&mut [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], 1, 42)
+            .uniform_random_sampling(&[1, 2, 3, 4, 5, 6, 7, 8, 9, 10], 1, 42)
             .is_none());
-        assert!(vp9.uniform_random_sampling(&mut [100], 1, 42).is_none());
+        assert!(vp9.uniform_random_sampling(&[100], 1, 42).is_none());
 
-        assert!(auto1.uniform_random_sampling(&mut [1, -1], 1, 42).is_none());
+        assert!(auto1.uniform_random_sampling(&[1, -1], 1, 42).is_none());
         assert!(auto1
-            .uniform_random_sampling(&mut [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], 1, 42)
-            .is_none());
-        assert!(auto1
-            .uniform_random_sampling(&mut [-10_000], 1, 42)
+            .uniform_random_sampling(&[1, 2, 3, 4, 5, 6, 7, 8, 9, 10], 1, 42)
             .is_none());
+        assert!(auto1.uniform_random_sampling(&[-10_000], 1, 42).is_none());
     }
 }
diff --git a/ddnnife/tests/write_to_file.rs b/ddnnife/tests/write_to_file.rs
@@ -13,7 +13,7 @@ fn card_of_features_normal_and_reloaded_test() {
 
     // save nnf in c2d format
     let saved_nnf = "./tests/data/auto1_d4_to_c2d.nnf";
-    write_ddnnf_to_file(&mut ddnnf, saved_nnf).unwrap();
+    write_ddnnf_to_file(&ddnnf, saved_nnf).unwrap();
 
     // compute the cardinality of features for the saved file
     let saved_out = "./tests/data/auto1_d4_to_c2d_fs.csv";

diff --git a/deny.toml b/deny.toml
@@ -0,0 +1,8 @@
+[licenses]
+allow = [
+    "LGPL-3.0",
+    "MIT",
+    "BSD-3-Clause",
+    "BSL-1.0",
+    "Unicode-DFS-2016",
+]
diff --git a/doc/aarch64-darwin-d4.md b/doc/aarch64-darwin-d4.md
diff --git a/doc/windows-d4.md b/doc/windows-d4.md