Fixes

Author: RogerTaule

macros-test/src/lib.rs

@@ -469,7 +469,7 @@ mod tests {
 
         // Now set_all on field3, which starts at bit 8 of the same packed[0].
         let vals: [[[u16; 4]; 2]; 3] =
-            std::array::from_fn(|i| std::array::from_fn(|j| std::array::from_fn(|k| ((i * 8 + j * 4 + k + 1) as u16))));
+            std::array::from_fn(|i| std::array::from_fn(|j| std::array::from_fn(|k| (i * 8 + j * 4 + k + 1) as u16)));
         row.set_all_field3(&vals);
 
         // field1 must still have the original value.

pil2-components/test/common/rs/src/lib.rs

@@ -83,7 +83,7 @@ pub fn run_pipeline(dir: &str, pil_file: &str, lib: &str) -> Result<(), String>
         .register_custom_commits(HashMap::<String, PathBuf>::new())
         .map_err(|e| format!("register_custom_commits: {e}"))?;
     proofman
-        .verify_proof_constraints(witness, None, None, &DebugInfo::default(), 0u8.into())
+        .verify_proof_constraints(witness, None, None, Some(&DebugInfo::default()), 0u8.into())
         .map_err(|e| format!("verify_proof_constraints: {e}"))?;
 
     Ok(())

pil2-stark/src/api/starks_api.cu

@@ -586,7 +586,7 @@ uint64_t gen_proof_gpu(void *pSetupCtx_, uint64_t airgroupId, uint64_t airId, ui
     uint64_t offsetPublicInputs = setupCtx->starkInfo.mapOffsetsGPU[std::make_pair("publics", false)];
 
     if (setupCtx->starkInfo.mapTotalNCustomCommitsFixed > 0) {
-        Goldilocks::Element *pCustomCommitsFixed = (Goldilocks::Element *)d_aux_trace + setupCtx->starkInfo.mapOffsets[std::make_pair("custom_fixed", false)];
+        Goldilocks::Element *pCustomCommitsFixed = (Goldilocks::Element *)d_aux_trace + setupCtx->starkInfo.mapOffsetsGPU[std::make_pair("custom_fixed", false)];
         uint64_t customCommitsSize = setupCtx->starkInfo.mapTotalNCustomCommitsFixed * sizeof(Goldilocks::Element);
         // Skip the 32-byte Merkle-root header at the start of the file (assumes 1 custom commit per AIR).
         load_and_copy_to_device_in_chunks(d_buffers, customCommitsFixedPath, (uint8_t*)pCustomCommitsFixed, customCommitsSize, streamId, 32);
@@ -680,7 +680,7 @@ uint64_t initialize_instance_gpu(void *pSetupCtx_, uint64_t airgroupId, uint64_t
     uint64_t offsetPublicInputs = setupCtx->starkInfo.mapOffsetsGPU[std::make_pair("publics", false)];
 
     if (setupCtx->starkInfo.mapTotalNCustomCommitsFixed > 0) {
-        Goldilocks::Element *pCustomCommitsFixed = (Goldilocks::Element *)d_aux_trace + setupCtx->starkInfo.mapOffsets[std::make_pair("custom_fixed", false)];
+        Goldilocks::Element *pCustomCommitsFixed = (Goldilocks::Element *)d_aux_trace + setupCtx->starkInfo.mapOffsetsGPU[std::make_pair("custom_fixed", false)];
         uint64_t customCommitsSize = setupCtx->starkInfo.mapTotalNCustomCommitsFixed * sizeof(Goldilocks::Element);
         load_and_copy_to_device_in_chunks(d_buffers, customCommitsFixedPath, (uint8_t*)pCustomCommitsFixed, customCommitsSize, streamId, 32);
     }
@@ -1258,7 +1258,7 @@ uint64_t commit_witness_gpu(void *pSetupCtx_, void *params_, uint64_t instanceId
         CHECKCUDAERR(cudaGetLastError());
 
         if (setupCtx->starkInfo.mapTotalNCustomCommitsFixed > 0) {
-            Goldilocks::Element *pCustomCommitsFixedDst = (Goldilocks::Element *)d_aux_trace + setupCtx->starkInfo.mapOffsets[std::make_pair("custom_fixed", false)];
+            Goldilocks::Element *pCustomCommitsFixedDst = (Goldilocks::Element *)d_aux_trace + setupCtx->starkInfo.mapOffsetsGPU[std::make_pair("custom_fixed", false)];
             uint64_t customCommitsSize = setupCtx->starkInfo.mapTotalNCustomCommitsFixed * sizeof(Goldilocks::Element);
             load_and_copy_to_device_in_chunks(d_buffers, customCommitsFixedPath, (uint8_t*)pCustomCommitsFixedDst, customCommitsSize, streamId, 32);
         }
@@ -1301,7 +1301,7 @@ uint64_t commit_witness_gpu(void *pSetupCtx_, void *params_, uint64_t instanceId
             pConstPolsAddress: d_const_pols_unpacked,
             pConstPolsExtendedTreeAddress: nullptr,
             pCustomCommitsFixed: setupCtx->starkInfo.mapTotalNCustomCommitsFixed > 0
-                ? (Goldilocks::Element *)d_aux_trace + setupCtx->starkInfo.mapOffsets[std::make_pair("custom_fixed", false)]
+                ? (Goldilocks::Element *)d_aux_trace + setupCtx->starkInfo.mapOffsetsGPU[std::make_pair("custom_fixed", false)]
                 : nullptr,
         };