Skip to content

Commit a61c4f4

Browse files
committed
Update to version 4.6.0.
1 parent 0f0b1d8 commit a61c4f4

File tree

7 files changed

+30
-11
lines changed

7 files changed

+30
-11
lines changed

.github/workflows/windows-arm64-wheels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Build Windows ARM64 wheels
33
on: [push]
44

55
env:
6-
MLPACK_COMMIT: 4.5.1
6+
MLPACK_COMMIT: 4.6.0
77
CIBW_TEST_COMMAND: python -c 'import mlpack; import numpy as np; x = np.random.rand(100, 10); o = mlpack.pca(input_=x, new_dimensionality=5, verbose=True)'
88

99
jobs:

Jenkinsfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ pipeline
55

66
environment
77
{
8-
MLPACK_VERSION = '4.5.1'
8+
MLPACK_VERSION = '4.6.0'
99
TWINE_PYPI_TOKEN = credentials('twine-pypi-token')
1010
}
1111

@@ -22,6 +22,7 @@ pipeline
2222
git clone https://github.com/mlpack/mlpack
2323
cd mlpack/
2424
git checkout $MLPACK_VERSION
25+
patch -p1 < ../cmake_stb_available.patch
2526
2627
mkdir build/
2728
cd build/

azure-pipelines-macos-steps.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ steps:
1111
git clone https://github.com/mlpack/mlpack
1212
cd mlpack
1313
git checkout $(MLPACK_VERSION)
14+
patch -p1 < ../cmake_stb_available.patch
1415
displayName: Clone mlpack
1516
1617
- bash: |
1718
mkdir -p mlpack/build
1819
cd mlpack/build
19-
# We download dependencies so that we get STB automatically.
20-
cmake -DBUILD_PYTHON_BINDINGS=ON -DDOWNLOAD_DEPENDENCIES=ON ../
20+
cmake -DBUILD_PYTHON_BINDINGS=ON ../
2121
make python_configured
2222
displayName: Generate setup.py
2323

azure-pipelines-windows-steps.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ steps:
5353
git clone https://github.com/mlpack/mlpack
5454
cd mlpack
5555
git checkout $(MLPACK_VERSION)
56+
patch -p1 < ../cmake_stb_available.patch
5657
displayName: Clone mlpack
5758
5859
- powershell: |

azure-pipelines.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
timeoutInMinutes: 0 # No limit for build time.
5555
pool: {vmImage: 'macOS-14'}
5656
variables:
57-
MLPACK_VERSION: 4.5.1
57+
MLPACK_VERSION: 4.6.0
5858
CIBW_TEST_COMMAND: python -c 'import mlpack; import numpy as np; x = np.random.rand(100, 10); o = mlpack.pca(input_=x, new_dimensionality=5, verbose=True)'
5959
# The PYPI_TOKEN variable is automatically set by Azure Pipelines.
6060
TWINE_PYPI_TOKEN: $(PYPI_TOKEN)
@@ -144,7 +144,7 @@ jobs:
144144
timeoutInMinutes: 0 # No limit for build time.
145145
pool: {vmImage: 'windows-2019'}
146146
variables:
147-
MLPACK_VERSION: 4.5.1
147+
MLPACK_VERSION: 4.6.0
148148
# The PYPI_TOKEN variable is automatically set by Azure Pipelines.
149149
TWINE_PYPI_TOKEN: $(PYPI_TOKEN)
150150
steps:

build_mlpack.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@ set -e -u -o pipefail
77
yum install -y openblas-devel armadillo-devel cereal-devel ensmallen-devel wget
88
pip install cython numpy pandas wheel setuptools
99

10-
# STB must be installed by hand.
11-
wget https://www.mlpack.org/files/stb.tar.gz
12-
tar -xvzpf stb.tar.gz
13-
rm -f stb.tar.gz
14-
1510
cd mlpack/
1611
rm -rf build/
1712
mkdir build/

cmake_stb_available.patch

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
--- mlpack-4.6.0/src/mlpack/methods/CMakeLists.txt 2025-04-03 15:47:01.000000000 +0000
2+
+++ mlpack-4.6.0-new/src/mlpack/methods/CMakeLists.txt 2025-04-04 16:49:40.234267529 +0000
3+
@@ -27,6 +27,7 @@
4+
add_all_bindings(hmm hmm_loglik "Misc. / Other")
5+
add_all_bindings(hmm hmm_viterbi "Misc. / Other")
6+
add_all_bindings(hoeffding_trees hoeffding_tree "Classification")
7+
+add_all_bindings(preprocess image_converter "Preprocessing")
8+
add_all_bindings(kde kde "Misc. / Other")
9+
add_all_bindings(kernel_pca kernel_pca "Transformations")
10+
add_all_bindings(kmeans kmeans "Clustering")
11+
@@ -88,11 +89,6 @@
12+
add_cli_executable(preprocess preprocess_imputer)
13+
add_markdown_docs(preprocess preprocess_imputer "cli" "")
14+
15+
-# The image converter is only enabled if STB is available.
16+
-if (STB_AVAILABLE)
17+
- add_all_bindings(preprocess image_converter "Preprocessing")
18+
-endif()
19+
-
20+
# Range search provides a vector of vector of results, and this is only
21+
# supported for the CLI bindings.
22+
add_category(range_search "Geometry")

0 commit comments

Comments
 (0)