Skip to content

Commit

Permalink
Update to latest stable version.
Browse files Browse the repository at this point in the history
  • Loading branch information
rcurtin committed Sep 20, 2024
1 parent 09b1953 commit 9bc3319
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 35 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/windows-arm64-wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Build Windows ARM64 wheels
on: [push]

env:
MLPACK_COMMIT: 4.4.0
MLPACK_COMMIT: 4.5.0
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)'

jobs:
Expand Down Expand Up @@ -87,9 +87,6 @@ jobs:
git clone https://github.com/mlpack/mlpack
cd mlpack
git checkout $MLPACK_VERSION
sed -i.bk 's/${PACKAGE_VERSION}/${PACKAGE_VERSION}.post1/g' src/mlpack/bindings/python/setup.py.in
rm -f src/mlpack/bindings/python/setup.py.in.bk
patch -p1 < ../numpy2.patch
- name: Generate setup.py
shell: powershell
Expand Down
8 changes: 1 addition & 7 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pipeline

environment
{
MLPACK_VERSION = '4.4.0'
MLPACK_VERSION = '4.5.0'
TWINE_PYPI_TOKEN = credentials('twine-pypi-token')
}

Expand All @@ -23,12 +23,6 @@ pipeline
cd mlpack/
git checkout $MLPACK_VERSION
# Temporary patch: increment build number.
sed -i.bk 's/${PACKAGE_VERSION}/${PACKAGE_VERSION}.post1/g' src/mlpack/bindings/python/setup.py.in
rm -f src/mlpack/bindings/python/setup.py.in.bk
# Apply patches.
patch -p1 < ../numpy2.patch
mkdir build/
cd build/
cmake -DBUILD_PYTHON_BINDINGS=ON ../
Expand Down
4 changes: 0 additions & 4 deletions azure-pipelines-macos-steps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ steps:
git clone https://github.com/mlpack/mlpack
cd mlpack
git checkout $(MLPACK_VERSION)
sed -i.bk 's/${PACKAGE_VERSION}/${PACKAGE_VERSION}.post1/g' src/mlpack/bindings/python/setup.py.in
rm -f src/mlpack/bindings/python/setup.py.in.bk
# Apply patches.
patch -p1 < ../numpy2.patch
displayName: Clone mlpack
- bash: |
Expand Down
4 changes: 0 additions & 4 deletions azure-pipelines-windows-steps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,6 @@ steps:
git clone https://github.com/mlpack/mlpack
cd mlpack
git checkout $(MLPACK_VERSION)
sed -i.bk 's/${PACKAGE_VERSION}/${PACKAGE_VERSION}.post1/g' src/mlpack/bindings/python/setup.py.in
rm -f src/mlpack/bindings/python/setup.py.in.bk
# Apply patches.
patch -p1 < ../numpy2.patch
displayName: Clone mlpack
- powershell: |
Expand Down
4 changes: 2 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
timeoutInMinutes: 0 # No limit for build time.
pool: {vmImage: 'macOS-14'}
variables:
MLPACK_VERSION: 4.4.0
MLPACK_VERSION: 4.5.0
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)'
# The PYPI_TOKEN variable is automatically set by Azure Pipelines.
TWINE_PYPI_TOKEN: $(PYPI_TOKEN)
Expand Down Expand Up @@ -163,7 +163,7 @@ jobs:
timeoutInMinutes: 0 # No limit for build time.
pool: {vmImage: 'windows-2019'}
variables:
MLPACK_VERSION: 4.4.0
MLPACK_VERSION: 4.5.0
# The PYPI_TOKEN variable is automatically set by Azure Pipelines.
TWINE_PYPI_TOKEN: $(PYPI_TOKEN)
steps:
Expand Down
14 changes: 0 additions & 14 deletions numpy2.patch

This file was deleted.

0 comments on commit 9bc3319

Please sign in to comment.