From ed04e2c58001a59c97d0d650919053312ad884bd Mon Sep 17 00:00:00 2001 From: Ralf Biedert Date: Sat, 14 Dec 2024 16:54:52 +0100 Subject: [PATCH] Enable tests that previously ICEed. --- tests/svm_dense_class.rs | 16 ++++++++-------- tests/svm_sparse_class.rs | 18 ++++++++++-------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/tests/svm_dense_class.rs b/tests/svm_dense_class.rs index 71c17da..4db7bdc 100644 --- a/tests/svm_dense_class.rs +++ b/tests/svm_dense_class.rs @@ -44,10 +44,10 @@ mod svm_dense_class { test_model!(m_csvm_sigmoid_prob, "m_csvm_sigmoid_prob.libsvm", true, [0, 5], [0, 7]); // apparently `libSVM` gets this wrong // Temporarily disabled as they trigger ICE in Rust Nightly - // test_model!(m_csvm_linear, "m_csvm_linear.libsvm", false, [0, 7], []); - // test_model!(m_csvm_poly, "m_csvm_poly.libsvm", false, [0, 7], []); - // test_model!(m_csvm_rbf, "m_csvm_rbf.libsvm", false, [0, 7], []); - // test_model!(m_csvm_sigmoid, "m_csvm_sigmoid.libsvm", false, [0, 5], []); + test_model!(m_csvm_linear, "m_csvm_linear.libsvm", false, [0, 7], [0, 0]); + test_model!(m_csvm_poly, "m_csvm_poly.libsvm", false, [0, 7], [0, 0]); + test_model!(m_csvm_rbf, "m_csvm_rbf.libsvm", false, [0, 7], [0, 0]); + test_model!(m_csvm_sigmoid, "m_csvm_sigmoid.libsvm", false, [0, 5], [0, 0]); // NUSVM test_model!(m_nusvm_linear_prob, "m_nusvm_linear_prob.libsvm", true, [0, 7], [0, 7]); @@ -56,8 +56,8 @@ mod svm_dense_class { test_model!(m_nusvm_sigmoid_prob, "m_nusvm_sigmoid_prob.libsvm", true, [0, 7], [0, 7]); // Temporarily disabled as they trigger ICE in Rust Nightly - // test_model!(m_nusvm_linear, "m_nusvm_linear.libsvm", false, [0, 7], []); - // test_model!(m_nusvm_poly, "m_nusvm_poly.libsvm", false, [0, 7], []); - // test_model!(m_nusvm_rbf, "m_nusvm_rbf.libsvm", false, [0, 7], []); - // test_model!(m_nusvm_sigmoid, "m_nusvm_sigmoid.libsvm", false, [0, 7], []); + test_model!(m_nusvm_linear, "m_nusvm_linear.libsvm", false, [0, 7], [0, 0]); + test_model!(m_nusvm_poly, "m_nusvm_poly.libsvm", false, [0, 7], [0, 0]); + test_model!(m_nusvm_rbf, "m_nusvm_rbf.libsvm", false, [0, 7], [0, 0]); + test_model!(m_nusvm_sigmoid, "m_nusvm_sigmoid.libsvm", false, [0, 7], [0, 0]); } diff --git a/tests/svm_sparse_class.rs b/tests/svm_sparse_class.rs index 5ad3e22..7dd9552 100644 --- a/tests/svm_sparse_class.rs +++ b/tests/svm_sparse_class.rs @@ -65,20 +65,22 @@ mod svm_sparse_class { test_model!(m_csvm_sigmoid_prob, "m_csvm_sigmoid_prob.libsvm", true, [0, 7], [7, 1]); // Temporarily disabled as they trigger ICE in Rust Nightly - // test_model!(m_csvm_linear, "m_csvm_linear.libsvm", false, [0, 7], []); - // test_model!(m_csvm_poly, "m_csvm_poly.libsvm", false, [0, 7], []); - // test_model!(m_csvm_rbf, "m_csvm_rbf.libsvm", false, [0, 7], []); - // test_model!(m_csvm_sigmoid, "m_csvm_sigmoid.libsvm", false, [0, 5], []); + test_model!(m_csvm_linear, "m_csvm_linear.libsvm", false, [0, 7], [0, 0]); + test_model!(m_csvm_poly, "m_csvm_poly.libsvm", false, [0, 7], [0, 0]); + test_model!(m_csvm_rbf, "m_csvm_rbf.libsvm", false, [0, 7], [0, 0]); + // TODO: Why do these fail? + // test_model!(m_csvm_sigmoid, "m_csvm_sigmoid.libsvm", false, [0, 5], [0, 0]); // NUSVM + // TODO: Why do these fail? // test_model!(m_nusvm_linear_prob, "m_nusvm_linear_prob.libsvm", true, [0, 7], [1, 6]); // test_model!(m_nusvm_poly_prob, "m_nusvm_poly_prob.libsvm", true, [0, 7], [0, 7]); // test_model!(m_nusvm_rbf_prob, "m_nusvm_rbf_prob.libsvm", true, [0, 7], [0, 7]); // test_model!(m_nusvm_sigmoid_prob, "m_nusvm_sigmoid_prob.libsvm", true, [0, 7], [0, 7]); // Temporarily disabled as they trigger ICE in Rust Nightly - // test_model!(m_nusvm_linear, "m_nusvm_linear.libsvm", false, [0, 7], []); - // test_model!(m_nusvm_poly, "m_nusvm_poly.libsvm", false, [0, 7], []); - // test_model!(m_nusvm_rbf, "m_nusvm_rbf.libsvm", false, [0, 7], []); - // test_model!(m_nusvm_sigmoid, "m_nusvm_sigmoid.libsvm", false, [0, 7], []); + test_model!(m_nusvm_linear, "m_nusvm_linear.libsvm", false, [0, 7], [0, 0]); + test_model!(m_nusvm_poly, "m_nusvm_poly.libsvm", false, [0, 7], [0, 0]); + test_model!(m_nusvm_rbf, "m_nusvm_rbf.libsvm", false, [0, 7], [0, 0]); + test_model!(m_nusvm_sigmoid, "m_nusvm_sigmoid.libsvm", false, [0, 7], [0, 0]); }