feat: logging

AleoNet · Jun 2, 2023 · 9581fe2 · 9581fe2
1 parent 576c1b2
commit 9581fe2
Show file tree

Hide file tree

Showing 79 changed files with 365 additions and 191 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -239,6 +239,12 @@ optional = true
 version = "2.6"
 features = [ "json" ]
 
+[dependencies.log]
+version = "0.4.14"
+
+[dependencies.simple_logger]
+version = "4.1"
+
 [dev-dependencies.bincode]
 version = "1.3"
 

diff --git a/algorithms/Cargo.toml b/algorithms/Cargo.toml
@@ -145,6 +145,9 @@ version = "1.0"
 version = "0.4"
 optional = true
 
+[dependencies.log]
+version = "0.4.14"
+
 [dev-dependencies.expect-test]
 version = "1.4.1"
 

diff --git a/algorithms/src/fft/domain.rs b/algorithms/src/fft/domain.rs
@@ -1139,7 +1139,7 @@ mod tests {
     fn test_fft_correctness_cuda() {
         let mut rng = TestRng::default();
         for log_domain in 2..20 {
-            println!("Testing domain size {log_domain}");
+            trace!("Testing domain size {log_domain}");
             let domain_size = 1 << log_domain;
             let random_polynomial = DensePolynomial::<Fr>::rand(domain_size - 1, &mut rng);
             let mut polynomial_evaluations = random_polynomial.coeffs.clone();
@@ -1158,7 +1158,7 @@ mod tests {
             )
             .is_err()
             {
-                println!("cuda error!");
+                trace!("cuda error!");
             }
 
             assert_eq!(polynomial_evaluations, polynomial_evaluations_cuda, "domain size = {domain_size}");
@@ -1173,7 +1173,7 @@ mod tests {
             )
             .is_err()
             {
-                println!("cuda error!");
+                trace!("cuda error!");
             }
             assert_eq!(random_polynomial.coeffs, polynomial_evaluations_cuda, "domain size = {domain_size}");
 
@@ -1193,7 +1193,7 @@ mod tests {
             )
             .is_err()
             {
-                println!("cuda error!");
+                trace!("cuda error!");
             }
 
             assert_eq!(polynomial_evaluations, polynomial_evaluations_cuda, "domain size = {domain_size}");
@@ -1208,7 +1208,7 @@ mod tests {
             )
             .is_err()
             {
-                println!("cuda error!");
+                trace!("cuda error!");
             }
             assert_eq!(random_polynomial.coeffs, polynomial_evaluations_cuda, "domain size = {domain_size}");
         }

diff --git a/algorithms/src/snark/marlin/ahp/indexer/indexer.rs b/algorithms/src/snark/marlin/ahp/indexer/indexer.rs
@@ -27,6 +27,7 @@ use crate::{
         MarlinMode,
     },
 };
+use log::{trace, warn};
 use snarkvm_fields::PrimeField;
 use snarkvm_r1cs::{errors::SynthesisError, ConstraintSynthesizer, ConstraintSystem};
 use snarkvm_utilities::cfg_into_iter;
@@ -36,8 +37,6 @@ use std::collections::BTreeMap;
 
 #[cfg(not(feature = "serial"))]
 use rayon::prelude::*;
-#[cfg(not(feature = "std"))]
-use snarkvm_utilities::println;
 
 use super::Matrix;
 
@@ -151,22 +150,20 @@ impl<F: PrimeField, MM: MarlinMode> AHPForR1CS<F, MM> {
         let num_non_zero_c = num_non_zero(&c);
         let num_variables = num_padded_public_variables + num_private_variables;
 
-        if cfg!(debug_assertions) {
-            println!("Number of padded public variables: {num_padded_public_variables}");
-            println!("Number of private variables: {num_private_variables}");
-            println!("Number of num_constraints: {num_constraints}");
-            println!("Number of non-zero entries in A: {num_non_zero_a}");
-            println!("Number of non-zero entries in B: {num_non_zero_b}");
-            println!("Number of non-zero entries in C: {num_non_zero_c}");
-        }
+        trace!("Number of padded public variables: {num_padded_public_variables}");
+        trace!("Number of private variables: {num_private_variables}");
+        trace!("Number of num_constraints: {num_constraints}");
+        trace!("Number of non-zero entries in A: {num_non_zero_a}");
+        trace!("Number of non-zero entries in B: {num_non_zero_b}");
+        trace!("Number of non-zero entries in C: {num_non_zero_c}");
 
         if num_constraints != num_variables {
-            eprintln!("Number of padded public variables: {num_padded_public_variables}");
-            eprintln!("Number of private variables: {num_private_variables}");
-            eprintln!("Number of num_constraints: {num_constraints}");
-            eprintln!("Number of non-zero entries in A: {num_non_zero_a}");
-            eprintln!("Number of non-zero entries in B: {num_non_zero_b}");
-            eprintln!("Number of non-zero entries in C: {num_non_zero_c}");
+            warn!("Number of padded public variables: {num_padded_public_variables}");
+            warn!("Number of private variables: {num_private_variables}");
+            warn!("Number of num_constraints: {num_constraints}");
+            warn!("Number of non-zero entries in A: {num_non_zero_a}");
+            warn!("Number of non-zero entries in B: {num_non_zero_b}");
+            warn!("Number of non-zero entries in C: {num_non_zero_c}");
             return Err(AHPError::NonSquareMatrix);
         }