Skip to content

Commit

Permalink
remove libblas mkl dependency (#799)
Browse files Browse the repository at this point in the history
* remove libblas mkl dependency

* add README

* changelog fix

* remove unecessary file
  • Loading branch information
MarcAntoineSchmidtQC authored May 28, 2024
1 parent 3562154 commit 4570c52
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 67 deletions.
12 changes: 1 addition & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,24 +40,14 @@ jobs:
steps:
- name: Checkout branch
uses: actions/checkout@v4
- name: Set up conda env (windows and ubuntu)
if: matrix.os != 'macos-latest'
- name: Set up conda env
uses: mamba-org/setup-micromamba@f8b8a1e23a26f60a44c853292711bacfd3eac822
with:
environment-file: environment.yml
init-shell: ${{ matrix.os == 'windows-latest' && 'powershell' || 'bash' }}
cache-environment: true
create-args: >-
python=${{ matrix.python-version }}
- name: Set up conda env (macos)
if: matrix.os == 'macos-latest'
uses: mamba-org/setup-micromamba@f8b8a1e23a26f60a44c853292711bacfd3eac822
with:
environment-file: environment-macos.yml
init-shell: bash
cache-environment: true
create-args: >-
python=${{ matrix.python-version }}
- name: Install repository (unix)
if: matrix.os != 'windows-latest'
shell: bash -el {0}
Expand Down
12 changes: 8 additions & 4 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,21 @@ Changelog
=========


3.0.2 - 2024-XX-XX
------------------
Unreleased
----------

**Bug fix**
**Bug fix:**

- Fixed :meth:`~glum.GeneralizedLinearRegressor.wald_test` when using ``terms`` and no intercept.

**Other changes:**

- Removed libblas MKL from the development environment.

3.0.1 - 2024-05-23
------------------

**Bug fix**
**Bug fix:**

- We now support scikit-learn 1.5.

Expand Down
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,3 +97,9 @@ Please install the package through conda-forge:
```bash
conda install glum -c conda-forge
```

# Performance

For optimal performance on an x86_64 architecture, we recommend using the MKL library
(`conda install mkl`). By default, conda usually installs the openblas version, which
is slower, but supported on all major architecture and OS.
51 changes: 0 additions & 51 deletions environment-macos.yml

This file was deleted.

1 change: 0 additions & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ channels:
dependencies:
# required for users (note: this is not where you specify new dependencies
# for the conda packages. please put those `conda.recipe/meta.yaml`!!
- libblas>=0=*mkl # comment this line out for macOS arm64
- numexpr
- pandas>=0.21
- tabmat>=4.0.0
Expand Down

0 comments on commit 4570c52

Please sign in to comment.