Skip to content

Commit

Permalink
Revert "re-enable mkl :("
Browse files Browse the repository at this point in the history
This reverts commit e48525b.
  • Loading branch information
bpteague committed Jan 17, 2022
1 parent e48525b commit 7554c13
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 1 deletion.
12 changes: 12 additions & 0 deletions .github/workflows/create-release-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ jobs:
id: display
run: |
echo 'Output from Find Tag: ${{steps.tag.outputs.tag}}'
- name: Remove nomkl
run: |
sed -i '/nomkl/d' environment.yml
- name: Setup Miniconda
uses: conda-incubator/setup-miniconda@v2.0.1
Expand Down Expand Up @@ -106,6 +110,10 @@ jobs:
ref: ${{ github.event.client_payload.ref }}
fetch-depth: 0
submodules: true

- name: Remove nomkl
run: |
sed -i '/nomkl/d' environment.yml
- name: Setup Miniconda
uses: conda-incubator/setup-miniconda@v2.0.1
Expand Down Expand Up @@ -184,6 +192,10 @@ jobs:
id: display
run: |
echo 'Output from Find Tag: ${{steps.tag.outputs.tag}}'
- name: Remove nomkl
run: |
sed -i '/nomkl/d' environment.yml
- name: Setup Miniconda
uses: conda-incubator/setup-miniconda@v2.0.1
Expand Down
16 changes: 16 additions & 0 deletions .github/workflows/test-and-package-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ jobs:
uses: actions/checkout@v2
with:
submodules: true

- name: Remove nomkl
run: |
sed -i '/nomkl/d' environment.yml
- name: Setup Miniconda
uses: conda-incubator/setup-miniconda@v2.0.1
Expand Down Expand Up @@ -73,6 +77,10 @@ jobs:
with:
fetch-depth: 0
submodules: true

- name: Remove nomkl
run: |
sed -i '/nomkl/d' environment.yml
- name: Setup Miniconda
uses: conda-incubator/setup-miniconda@v2.0.1
Expand Down Expand Up @@ -121,6 +129,10 @@ jobs:
with:
fetch-depth: 0
submodules: true

- name: Remove nomkl
run: |
sed -i '/nomkl/d' environment.yml
- name: Setup Miniconda
uses: conda-incubator/setup-miniconda@v2.0.1
Expand Down Expand Up @@ -179,6 +191,10 @@ jobs:
id: display
run: |
echo 'Output from Find Tag: ${{steps.tag.outputs.tag}}'
- name: Remove nomkl
run: |
sed -i '/nomkl/d' environment.yml
- name: Setup Miniconda
uses: conda-incubator/setup-miniconda@v2.0.1
Expand Down
4 changes: 4 additions & 0 deletions docs/dev_manual/howto/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,10 @@ the appropriate file.
In the new repository you just cloned, say::

conda env create --name cf_dev --file environment.yml
.. note:: On Windows, you must edit ``environment.yml`` before you execute
``conda env create``. Remove the last line, the one that reads
``- nomkl # [not win]``

* Activate the new environment::
Expand Down
3 changes: 2 additions & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,5 @@ dependencies:
- yapf==0.30.0

- notebook


- nomkl # [not win]
6 changes: 6 additions & 0 deletions package/conda_recipes/cytoflow/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ requirements:

- camel==0.1.2
- yapf==0.30.0

# only install mkl libraries on windows, where they're required
- nomkl # [not win]

# - {{compiler('cxx')}}
- sphinx==4.2.0
Expand Down Expand Up @@ -87,6 +90,9 @@ requirements:
# gets installed
- notebook

# only install mkl libraries on windows, where they're required
- nomkl # [not win]

test:
# Python imports
imports:
Expand Down

0 comments on commit 7554c13

Please sign in to comment.