Skip to content

Commit

Permalink
Enable tests that previously ICEed.
Browse files Browse the repository at this point in the history
  • Loading branch information
@ralfbiedert
ralfbiedert committed Dec 14, 2024
1 parent 23c3d08 commit ed04e2c
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 16 deletions.
16 changes: 8 additions & 8 deletions tests/svm_dense_class.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
Expand All @@ -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]);
}
18 changes: 10 additions & 8 deletions tests/svm_sparse_class.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
}

0 comments on commit ed04e2c

Please sign in to comment.