fix linker errors (#1012)

montanalow · web-flow · commit ba3e72ff716b · 2023-09-12T14:32:30.000-07:00
diff --git a/pgml-extension/src/lib.rs b/pgml-extension/src/lib.rs
@@ -29,19 +29,17 @@ pub extern "C" fn _PG_init() {
 #[cfg(any(test, feature = "pg_test"))]
 #[pg_schema]
 mod tests {
-    use super::*;
-
     #[test]
     fn test_migration_file_exists() {
         let paths = std::fs::read_dir("./sql").unwrap();
         for path in paths {
             let path = path.unwrap().path().display().to_string();
-            if path.contains(VERSION) {
+            if path.contains(crate::VERSION) {
                 return;
             }
         }
 
-        panic!("Migration file for version {} not found", VERSION);
+        panic!("Migration file for version {} not found", crate::VERSION);
     }
 }
 
diff --git a/pgml-extension/src/metrics.rs b/pgml-extension/src/metrics.rs
@@ -52,17 +52,17 @@ impl ConfusionMatrix {
         y_hat: &ArrayView1<usize>,
         num_classes: usize,
     ) -> ConfusionMatrix {
-        if ground_truth.len() != y_hat.len() {
-            error!("Can't compute metrics when the ground truth labels are a different size than the predicted labels. {} != {}", ground_truth.len(), y_hat.len())
-        };
-
         // Distinct classes.
         let mut classes = ground_truth.iter().collect::<BTreeSet<_>>();
         classes.extend(&mut y_hat.iter().collect::<BTreeSet<_>>().into_iter());
 
+        if ground_truth.len() != y_hat.len() {
+            error!("Can't compute metrics when the ground truth labels are a different size than the predicted labels. {} != {}", ground_truth.len(), y_hat.len());
+        }
+
         if num_classes != classes.len() {
-            error!("Can't compute metrics when the number of classes in the test set is different than the number of classes in the training set. {} != {}", num_classes, classes.len())
-        };
+            error!("Can't compute metrics when the number of classes in the test set is different than the number of classes in the training set. {} != {}", num_classes, classes.len());
+        }
 
         // Class value = index in the confusion matrix
         // e.g. class value 5 will be index 4 if there are classes 1, 2, 3 and 4 present.

Original file line number	Diff line number	Diff line change
`@@ -29,19 +29,17 @@ pub extern "C" fn _PG_init() {`
`29`	`29`	`#[cfg(any(test, feature = "pg_test"))]`
`30`	`30`	`#[pg_schema]`
`31`	`31`	`mod tests {`
`32`		`- use super::*;`
`33`		`-`
`34`	`32`	`#[test]`
`35`	`33`	`fn test_migration_file_exists() {`
`36`	`34`	`let paths = std::fs::read_dir("./sql").unwrap();`
`37`	`35`	`for path in paths {`
`38`	`36`	`let path = path.unwrap().path().display().to_string();`
`39`		`- if path.contains(VERSION) {`
	`37`	`+ if path.contains(crate::VERSION) {`
`40`	`38`	`return;`
`41`	`39`	`}`
`42`	`40`	`}`
`43`	`41`
`44`		`- panic!("Migration file for version {} not found", VERSION);`
	`42`	`+ panic!("Migration file for version {} not found", crate::VERSION);`
`45`	`43`	`}`
`46`	`44`	`}`
`47`	`45`