From baea64c38137db643733c7763de8087aa7eacf56 Mon Sep 17 00:00:00 2001 From: Igor Aleksanov Date: Thu, 15 Aug 2024 18:02:52 +0400 Subject: [PATCH] Fix paths --- .github/workflows/ci.yaml | 1 + .github/workflows/test-gpu.yaml | 2 ++ crates/shivini/src/test.rs | 13 ++++++++----- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ccdbcd0..eb9cd5a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -13,6 +13,7 @@ jobs: image: nvidia/cuda:${{ matrix.cuda }} env: BELLMAN_CUDA_DIR: ${{ github.workspace }}/bellman-cuda + CUDAARCHS: 89 steps: - name: Prepare environment env: diff --git a/.github/workflows/test-gpu.yaml b/.github/workflows/test-gpu.yaml index c9e9afd..8ac1295 100644 --- a/.github/workflows/test-gpu.yaml +++ b/.github/workflows/test-gpu.yaml @@ -97,6 +97,8 @@ jobs: run: | echo "/usr/local/nvidia/bin:/usr/local/cuda/bin" >> $GITHUB_PATH + - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3 + - name: Check Nvidia driver version run: | nvidia-smi diff --git a/crates/shivini/src/test.rs b/crates/shivini/src/test.rs index 099afc8..fa11b51 100644 --- a/crates/shivini/src/test.rs +++ b/crates/shivini/src/test.rs @@ -800,7 +800,7 @@ mod zksync { pub type ZksyncProof = Proof; - const TEST_DATA_ROOT_DIR: &str = "./test_data"; + const TEST_DATA_ROOT_DIR: &str = "./crates/shivini/test_data"; const DEFAULT_CIRCUIT_INPUT: &str = "default.circuit"; use crate::synthesis_utils::{ @@ -928,7 +928,7 @@ mod zksync { let _ctx = ProverContext::create().expect("gpu prover context"); for main_dir in ["base", "leaf", "node", "tip"] { - let data_dir = format!("./test_data/{}", main_dir); + let data_dir = format!("./crates/shivini/test_data/{}", main_dir); dbg!(&data_dir); let circuits = scan_directory_for_circuits(&data_dir); let reference_proofs = scan_directory_for_proofs(&data_dir); @@ -1019,7 +1019,7 @@ mod zksync { let worker = &Worker::new(); for main_dir in ["base", "leaf", "node", "tip"] { - let data_dir = format!("./test_data/{}", main_dir); + let data_dir = format!("./crates/shivini/test_data/{}", main_dir); dbg!(&data_dir); let circuits = scan_directory_for_circuits(&data_dir); @@ -1458,7 +1458,7 @@ mod zksync { let _worker = Worker::new(); for main_dir in ["base", "leaf", "node", "tip"] { - let data_dir = format!("./test_data/{}", main_dir); + let data_dir = format!("./crates/shivini/test_data/{}", main_dir); let circuits = scan_directory_for_circuits(&data_dir); let worker = &Worker::new(); @@ -1557,7 +1557,10 @@ mod zksync { }) .collect::>() .pop() - .unwrap_or(format!("./test_data/{}", DEFAULT_CIRCUIT_INPUT)) + .unwrap_or(format!( + "./crates/shivini/test_data/{}", + DEFAULT_CIRCUIT_INPUT + )) }; let data = std::fs::read(circuit_file_path).expect("circuit file");