re-enable mkl :(

cytoflow · Jan 17, 2022 · e48525b · e48525b
1 parent 264c274
commit e48525b
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 40 deletions.
diff --git a/.github/workflows/create-release-windows.yml b/.github/workflows/create-release-windows.yml
@@ -42,10 +42,6 @@ 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
@@ -110,10 +106,6 @@ 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
@@ -192,10 +184,6 @@ 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

diff --git a/.github/workflows/test-and-package-windows.yml b/.github/workflows/test-and-package-windows.yml
@@ -28,10 +28,6 @@ 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
@@ -77,10 +73,6 @@ 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
@@ -129,10 +121,6 @@ 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
@@ -191,10 +179,6 @@ 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

diff --git a/docs/dev_manual/howto/install.rst b/docs/dev_manual/howto/install.rst
@@ -135,10 +135,6 @@ 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::
     

diff --git a/environment.yml b/environment.yml
@@ -32,5 +32,4 @@ dependencies:
     - yapf==0.30.0
 
     - notebook
-
-    - nomkl # [not win]
+
diff --git a/package/conda_recipes/cytoflow/meta.yaml b/package/conda_recipes/cytoflow/meta.yaml
@@ -48,9 +48,6 @@ 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
@@ -90,9 +87,6 @@ requirements:
     # gets installed
     - notebook
 
-    # only install mkl libraries on windows, where they're required
-    - nomkl # [not win]
-
 test:
   # Python imports
   imports: