Merge pull request #45 from bacpop/gpu-flag

Add GPU_AVAILABLE macro to makefile for conda

.github/workflows/python-package-conda.yml

@@ -4,17 +4,23 @@ on: [push]
 
 jobs:
   build-linux:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        python-version: ["3.10"]
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install Conda environment from environment.yml
-      uses: mamba-org/provision-with-micromamba@main
+      uses: mamba-org/setup-micromamba@v2
       with:
-        cache-env: true
+        environment-file: environment.yml
+        cache-environment: true
+        create-args: >-
+          python=${{ matrix.python-version }}
     - name: Lint with flake8
       shell: bash -l {0}
       run: |

.readthedocs.yml

@@ -24,4 +24,3 @@ python:
       - requirements: docs/requirements.txt
       - method: setuptools
         path: docs
-

docs/conf.py

@@ -32,7 +32,8 @@
 # ones.
 extensions = [
     'sphinx.ext.mathjax',
-    'sphinx.ext.viewcode'
+    'sphinx.ext.viewcode',
+    'sphinx_rtd_theme'
 ]
 
 # Add any paths that contain templates here, relative to this directory.

docs/requirements.txt

@@ -1 +1,2 @@
-Cython>=0.26.1
+Cython>=0.26.1
+sphinx_rtd_theme

mandrake/__init__.py

@@ -3,4 +3,4 @@
 
 '''Visualisation of pathogen population structure'''
 
-__version__ = '1.2.2'
+__version__ = '1.2.3'

src/Makefile

@@ -26,6 +26,8 @@ else
 endif
 CUDA_LDFLAGS =-L$(LIBLOC)/lib -L${CUDA_HOME}/targets/x86_64-linux/lib/stubs -L${CUDA_HOME}/targets/x86_64-linux/lib
 CUDAFLAGS +=-Xcompiler -fPIC -Xptxas -dlcm=ca --cudart static --relocatable-device-code=true $(GENCODE)
+CXXFLAGS += -DGPU_AVAILABLE
+
 
 CPU_OBJS=wtsne_cpu.o python_bindings.o
 GPU_OBJS=wtsne_gpu.cu.o