Revert "updating range_search_test with mlpack/master (#7)"

This reverts commit 403b11e.

.ci/windows-steps.yaml

@@ -78,7 +78,6 @@ steps:
     msbuildVersion: $(MSBuildVersion)
     configuration: 'Release'
     msbuildArchitecture: 'x64'
-    platform: 'x64'
     msbuildArguments: /m /p:BuildInParallel=true
     maximumCpuCount: false
     clean: false

.github/workflows/main.yml

@@ -8,31 +8,13 @@ on:
       - master
   release:
     types: [published, created, edited]
-name: R CMD check mlpack
 
 jobs:
-  cancel:
-    name: 'Cancel Previous Builds'
-    if: ${{ github.event_name == 'pull_request' && github.repository == 'mlpack/mlpack' }}
-    runs-on: ubuntu-latest
-    timeout-minutes: 3
-    steps:
-      - name: Get all workflow ids and set to env variable
-        run: echo ::set-env name=WORKFLOW_IDS_TO_CANCEL::$(curl https://api.github.com/repos/${GITHUB_REPOSITORY}/actions/workflows -s | jq -r '.workflows | map(.id|tostring) | join(",")')
-
-      - uses: styfle/cancel-workflow-action@0.5.0
-        with:
-          workflow_id: ${{ env.WORKFLOW_IDS_TO_CANCEL }}
-          access_token: ${{ secrets.GITHUB_TOKEN }}
-
   jobR:
-    name: Build mlpack_r_tarball
-    if: ${{ github.repository == 'mlpack/mlpack' }}
+    name: mlpack-R
     runs-on: ubuntu-20.04
-
     outputs:
       r_bindings: ${{ steps.mlpack_version.outputs.mlpack_r_package }}
-
     steps:
         - uses: actions/checkout@v2
 
@@ -45,35 +27,16 @@ jobs:
             MLPACK_VERSION_VALUE=${MLPACK_VERSION_MAJOR}.${MLPACK_VERSION_MINOR}.${MLPACK_VERSION_PATCH}
             echo ::set-output name=mlpack_r_package::$(echo mlpack_"$MLPACK_VERSION_VALUE".tar.gz)
 
-        - uses: r-lib/actions/setup-r@master
-          with:
-            r-version: release
-
-        - name: Query dependencies
-          run: |
-            cp src/mlpack/bindings/R/mlpack/DESCRIPTION.in DESCRIPTION
-            Rscript -e "install.packages('remotes')" -e "saveRDS(remotes::dev_package_deps(dependencies = TRUE), 'depends.Rds')"
-
-        - name: Cache R packages
-          if: runner.os != 'Windows'
-          uses: actions/cache@v1
-          with:
-            path: ${{ env.R_LIBS_USER }}
-            key: ${{ runner.os }}-r-release-${{ hashFiles('depends.Rds') }}
-            restore-keys: ${{ runner.os }}-r-release-
-
         - name: Install Build Dependencies
           run: |
             sudo apt-get update
             sudo apt-get install -y --allow-unauthenticated libopenblas-dev liblapack-dev g++ libboost-all-dev
             curl https://data.kurg.org/armadillo-8.400.0.tar.xz | tar -xvJ && cd armadillo*
             cmake . && make && sudo make install && cd ..
-
-        - name: Install R-bindings dependencies
-          run: |
-            remotes::install_deps(dependencies = TRUE)
-            remotes::install_cran("roxygen2")
-          shell: Rscript {0}
+            sudo add-apt-repository 'deb https://cloud.r-project.org/bin/linux/ubuntu xenial-cran40/'
+            sudo apt-get -y update
+            sudo apt-get install -y r-base-core
+            sudo Rscript -e "install.packages(c('Rcpp', 'RcppArmadillo', 'RcppEnsmallen', 'BH', 'roxygen2', 'testthat'))"
 
         - name: CMake
           run: |
@@ -95,7 +58,6 @@ jobs:
     runs-on: ${{ matrix.config.os }}
 
     name: ${{ matrix.config.os }} (${{ matrix.config.r }})
-    if: ${{ github.repository == 'mlpack/mlpack' }}
 
     strategy:
       fail-fast: false
@@ -112,8 +74,6 @@ jobs:
       R_CHECK_ARGS: "--no-build-vignettes"
       _R_CHECK_FORCE_SUGGESTS: 0
       R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
-      RSPM: ${{ matrix.config.rspm }}
-      GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
 
     steps:
       - uses: actions/download-artifact@v2
@@ -126,22 +86,10 @@ jobs:
 
       - uses: r-lib/actions/setup-pandoc@master
 
-      - name: Query dependencies
-        run: Rscript -e "install.packages('remotes')" -e "saveRDS(remotes::dev_package_deps('${{ needs.jobR.outputs.r_bindings }}', dependencies = TRUE), 'depends.Rds')"
-
-      - name: Cache R packages
-        if: runner.os != 'Windows'
-        uses: actions/cache@v1
-        with:
-          path: ${{ env.R_LIBS_USER }}
-          key: ${{ runner.os }}-r-${{ matrix.config.r }}-${{ hashFiles('depends.Rds') }}
-          restore-keys: ${{ runner.os }}-r-${{ matrix.config.r }}-
-
       - name: Install dependencies
         run: |
-          remotes::install_deps('${{ needs.jobR.outputs.r_bindings }}', dependencies = TRUE)
-          remotes::install_cran("rcmdcheck")
-        shell: Rscript {0}
+          Rscript -e "install.packages('remotes')" -e "remotes::install_cran('rcmdcheck')"
+          Rscript -e "install.packages(c('Rcpp', 'RcppArmadillo', 'RcppEnsmallen', 'BH', 'roxygen2', 'testthat'))"
 
       - name: Check
         run: Rscript -e "rcmdcheck::rcmdcheck('${{ needs.jobR.outputs.r_bindings }}', args = c('--no-manual','--as-cran'), error_on = 'warning', check_dir = 'check')"

HISTORY.md

@@ -2,8 +2,6 @@
 ###### ????-??-??
   * Added Mean Absolute Percentage Error.
 
-  * Added Softmin activation function as layer in ann/layer.
-
 ### mlpack 3.4.1
 ###### 2020-09-07
   * Fix incorrect parsing of required matrix/model parameters for command-line

src/mlpack/methods/ann/layer/CMakeLists.txt

@@ -116,8 +116,6 @@ set(SOURCES
   celu_impl.hpp
   softshrink.hpp
   softshrink_impl.hpp
-  softmin.hpp
-  softmin_impl.hpp
 )
 
 # Add directory name to sources.

src/mlpack/methods/ann/layer/add.hpp

@@ -100,9 +100,6 @@ class Add
   //! Get the output size.
   size_t OutputSize() const { return outSize; }
 
-  //! Get the size of weights.
-  size_t WeightSize() const { return outSize; }
-
   /**
    * Serialize the layer
    */

src/mlpack/methods/ann/layer/atrous_convolution.hpp

@@ -257,12 +257,6 @@ class AtrousConvolution
   //! Modify the internal Padding layer.
   ann::Padding<>& Padding() { return padding; }
 
-  //! Get size of the weight matrix.
-  size_t WeightSize() const
-  {
-    return (outSize * inSize * kernelWidth * kernelHeight) + outSize;
-  }
-
   /**
    * Serialize the layer.
    */

src/mlpack/methods/ann/layer/layer.hpp

@@ -66,7 +66,6 @@
 #include "sequential.hpp"
 #include "softshrink.hpp"
 #include "softmax.hpp"
-#include "softmin.hpp"
 #include "spatial_dropout.hpp"
 #include "subview.hpp"
 #include "transposed_convolution.hpp"

src/mlpack/methods/ann/layer/linear.hpp

@@ -146,12 +146,6 @@ class Linear
   //! Modify the bias weights of the layer.
   OutputDataType& Bias() { return bias; }
 
-  //! Get the size of the weights.
-  size_t WeightSize() const
-  {
-    return (inSize * outSize) + outSize;
-  }
-
   /**
    * Serialize the layer
    */

src/mlpack/tests/CMakeLists.txt

@@ -8,6 +8,8 @@ add_executable(mlpack_test
   io_test.cpp
   cosine_tree_test.cpp
   dcgan_test.cpp
+  det_test.cpp
+  distribution_test.cpp
   drusilla_select_test.cpp
   emst_test.cpp
   fastmks_test.cpp
@@ -34,6 +36,7 @@ add_executable(mlpack_test
   math_test.cpp
   matrix_completion_test.cpp
   maximal_inputs_test.cpp
+  mean_shift_test.cpp
   metric_test.cpp
   mlpack_test.cpp
   mock_categorical_data.hpp
@@ -89,6 +92,7 @@ add_executable(mlpack_test
   main_tests/local_coordinate_coding_test.cpp
   main_tests/logistic_regression_test.cpp
   main_tests/lsh_test.cpp
+  main_tests/mean_shift_test.cpp
   main_tests/nbc_test.cpp
   main_tests/nmf_test.cpp
   main_tests/perceptron_test.cpp
@@ -118,8 +122,6 @@ add_executable(mlpack_catch_test
   dbscan_test.cpp
   decision_stump_test.cpp
   decision_tree_test.cpp
-  det_test.cpp
-  distribution_test.cpp
   feedforward_network_test.cpp
   image_load_test.cpp
   imputation_test.cpp
@@ -133,7 +135,6 @@ add_executable(mlpack_catch_test
   load_save_test.cpp
   loss_functions_test.cpp
   main.cpp
-  mean_shift_test.cpp
   nca_test.cpp
   one_hot_encoding_test.cpp
   pca_test.cpp
@@ -167,7 +168,6 @@ add_executable(mlpack_catch_test
   main_tests/kmeans_test.cpp
   main_tests/knn_test.cpp
   main_tests/linear_regression_test.cpp
-  main_tests/mean_shift_test.cpp
   main_tests/nca_test.cpp
   main_tests/pca_test.cpp
   main_tests/preprocess_binarize_test.cpp