Disable auto-download by default + improve test stability #3076
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -44,6 +44,11 @@ else() | |
| "Compile shared libraries (if OFF, static libraries and binaries are compiled)." ON) | ||
| endif() | ||
|
|
||
| # Enable auto-download if we are cross compiling. | ||
| if (CMAKE_CROSSCOMPILING) | ||
| set(DOWNLOAD_DEPENDENCIES ON) | ||
| endif() | ||
|
|
||
| # Support preference of static libs by adjusting CMAKE_FIND_LIBRARY_SUFFIXES. | ||
| if (NOT BUILD_SHARED_LIBS) | ||
| if(WIN32) | ||
|
|
@@ -157,7 +162,7 @@ set(COMPILER_SUPPORT_LIBRARIES "") | |
| # If we are using MSVC, we need /bigobj. | ||
| if (MSVC) | ||
| set(CMAKE_CXX_STANDARD 17) | ||
| set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj /Zm200 /Zc:__cplusplus") | ||
| endif () | ||
|
|
||
| # If we are using MINGW, we need sections and big-obj, otherwise we create too | ||
|
|
@@ -283,7 +288,7 @@ if (CMAKE_CROSSCOMPILING) | |
| search_openblas(0.3.13) | ||
| endif() | ||
|
|
||
| if (NOT DOWNLOAD_DEPENDENCIES) | ||
| find_package(Armadillo "${ARMADILLO_VERSION}" REQUIRED) | ||
| else() | ||
| find_package(Armadillo "${ARMADILLO_VERSION}") | ||
|
|
@@ -305,7 +310,7 @@ set(MLPACK_INCLUDE_DIRS ${MLPACK_INCLUDE_DIRS} ${ARMADILLO_INCLUDE_DIRS}) | |
| set(MLPACK_LIBRARIES ${MLPACK_LIBRARIES} ${ARMADILLO_LIBRARIES}) | ||
|
|
||
| # Find stb_image.h and stb_image_write.h. | ||
| if (NOT DOWNLOAD_DEPENDENCIES) | ||
| find_package(StbImage) | ||
| else() | ||
| find_package(StbImage) | ||
|
|
@@ -323,7 +328,7 @@ if (STB_IMAGE_FOUND) | |
| endif() | ||
|
|
||
| # Find ensmallen. | ||
| if (NOT DOWNLOAD_DEPENDENCIES) | ||
| find_package(Ensmallen "${ENSMALLEN_VERSION}" REQUIRED) | ||
| else() | ||
| find_package(Ensmallen "${ENSMALLEN_VERSION}") | ||
|
|
@@ -336,7 +341,7 @@ endif() | |
| set(MLPACK_INCLUDE_DIRS ${MLPACK_INCLUDE_DIRS} "${ENSMALLEN_INCLUDE_DIR}") | ||
|
|
||
| # Find cereal. | ||
| if (NOT DOWNLOAD_DEPENDENCIES) | ||
| find_package(cereal "${CEREAL_VERSION}" REQUIRED) | ||
| else() | ||
| find_package(cereal "${CEREAL_VERSION}") | ||
|
|
@@ -377,7 +382,7 @@ set(Boost_ADDITIONAL_VERSIONS | |
| # TODO for the brave: transition all mlpack's CMake to 'target-based modern | ||
| # CMake'. Good luck! You'll need it. | ||
| set(Boost_NO_BOOST_CMAKE 1) | ||
| if (NOT DOWNLOAD_DEPENDENCIES) | ||
| find_package(Boost "${BOOST_VERSION}" REQUIRED) | ||
| else() | ||
| find_package(Boost "${BOOST_VERSION}") | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -162,12 +162,12 @@ Convolution< | |
| padWRight(layer.padWRight), | ||
| padHBottom(layer.padHBottom), | ||
| padHTop(layer.padHTop), | ||
| weights(layer.weights), | ||
| inputWidth(layer.inputWidth), | ||
| inputHeight(layer.inputHeight), | ||
| outputWidth(layer.outputWidth), | ||
| outputHeight(layer.outputHeight), | ||
| padding(layer.padding) | ||
| { | ||
| // Nothing to do here. | ||
| } | ||
|
|
@@ -197,12 +197,12 @@ Convolution< | |
| padWRight(layer.padWRight), | ||
| padHBottom(layer.padHBottom), | ||
| padHTop(layer.padHTop), | ||
| weights(std::move(layer.weights)), | ||
| inputWidth(layer.inputWidth), | ||
| inputHeight(layer.inputHeight), | ||
| outputWidth(layer.outputWidth), | ||
| outputHeight(layer.outputHeight), | ||
| padding(std::move(layer.padding)) | ||
|
There was a problem hiding this comment. Thank you for these warning fixes! 💯 |
||
| { | ||
| // Nothing to do here. | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -225,35 +225,46 @@ template<typename DecompositionPolicy, | |
| typename InterpolationPolicy = AverageInterpolation> | ||
| void CFPredict(const double rmseBound = 1.5) | ||
| { | ||
| // We run the test multiple times, since it sometimes fails, in order to get | ||
| // the probability of failure down. | ||
| bool success = false; | ||
| const size_t trials = 8; | ||
| for (size_t trial = 0; trial < trials; ++trial) | ||
| { | ||
| DecompositionPolicy decomposition; | ||
|
|
||
| // Small GroupLens dataset. | ||
| arma::mat dataset; | ||
|
|
||
| // Save the columns we've removed. | ||
| arma::mat savedCols; | ||
|
|
||
| GetDatasets(dataset, savedCols); | ||
|
|
||
| CFType<DecompositionPolicy, | ||
| NormalizationType> c(dataset, decomposition, 5, 5, 30); | ||
|
|
||
| // Now, for each removed rating, make sure the prediction is... reasonably | ||
| // accurate. | ||
| double totalError = 0.0; | ||
| for (size_t i = 0; i < savedCols.n_cols; ++i) | ||
| { | ||
| const double prediction = c.template Predict<NeighborSearchPolicy, | ||
| InterpolationPolicy>(savedCols(0, i), savedCols(1, i)); | ||
|
|
||
| const double error = std::pow(prediction - savedCols(2, i), 2.0); | ||
| totalError += error; | ||
| } | ||
|
|
||
| const double rmse = std::sqrt(totalError / savedCols.n_cols); | ||
| if (rmse < rmseBound) | ||
| { | ||
| success = true; | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| REQUIRE(success == true); | ||
| } | ||
|
|
||
| // Do the same thing as the previous test, but ensure that the ratings we | ||
|
|
@@ -1220,8 +1231,9 @@ TEST_CASE("CFPredictSimilarityInterpolation", "[CFTest]") | |
| */ | ||
| TEST_CASE("CFPredictRegressionInterpolation", "[CFTest]") | ||
| { | ||
| // Larger tolerance is sometimes needed. | ||
| CFPredict<RegSVDPolicy, | ||
| OverallMeanNormalization, | ||
| EuclideanSearch, | ||
| RegressionInterpolation>(2.2); | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -639,7 +639,7 @@ TEST_CASE("MultiSplitTest2", "[DecisionTreeRegressorTest]") | |
| arma::rowvec responses; | ||
| arma::rowvec values = {0.0, 1.0, 2.0, 1.0, 0.0}; | ||
|
|
||
| CreateMultiSplitData(dataset, responses, 1000, values); | ||
|
|
||
| arma::rowvec weights(responses.n_elem); | ||
| weights.ones(); | ||
|
|
@@ -931,7 +931,7 @@ TEST_CASE("CategoricalMADGainWeightedBuildTest", "[DecisionTreeRegressorTest]") | |
|
|
||
| // Make sure we get reasonable rmse. | ||
| const double rmse = RMSE(predictions, testResponses); | ||
| REQUIRE(rmse < 1.05); | ||
| } | ||
|
|
||
| /** | ||
|
|
@@ -959,7 +959,7 @@ TEST_CASE("SimpleGeneralizationTest_", "[DecisionTreeRegressorTest]") | |
|
|
||
| // Figure out rmse. | ||
| double rmse = RMSE(predictions, testResponses); | ||
| REQUIRE(rmse < 6.1); | ||
|
|
||
| // Reset the predictions. | ||
| predictions.zeros(); | ||
|
|
@@ -969,7 +969,7 @@ TEST_CASE("SimpleGeneralizationTest_", "[DecisionTreeRegressorTest]") | |
|
|
||
| // Figure out rmse. | ||
| rmse = RMSE(predictions, testResponses); | ||
| REQUIRE(rmse < 6.1); | ||
| } | ||
|
|
||
| /** | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You'll also need to change the Julia versions here to
1.6.3(throughout the file), and the-DJULIA_EXECUTABLEoption to-DJULIA_EXECUTABLE=/opt/julia-1.6.3/bin/julia.