From 488bc0d21b421ea0e3550139b669125ef6e67542 Mon Sep 17 00:00:00 2001 From: Sam Horsfield Date: Tue, 28 Mar 2023 14:10:11 +0100 Subject: [PATCH] Updates version to 1.3.4 --- .github/workflows/python-package-conda.yml | 4 ++-- CMakeLists.txt | 2 -- cmake/FindMKL.cmake | 2 +- environment_linux.yml | 1 + environment_macOS.yml | 1 + ggCaller/__init__.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml index 155c7ec..5a55f41 100644 --- a/.github/workflows/python-package-conda.yml +++ b/.github/workflows/python-package-conda.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: [3.8] + python-version: [3.9] steps: - name: checkout source @@ -46,7 +46,7 @@ jobs: runs-on: macos-latest strategy: matrix: - python-version: [3.8] + python-version: [3.9] steps: - name: checkout source diff --git a/CMakeLists.txt b/CMakeLists.txt index c445a6a..da94cce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,8 +64,6 @@ SET( tbb_LIBRARIES ${tbb_LIBRARY} ) find_package(MKL) #SET(MKL_LIBRARIES) #list(APPEND MKL_LIBRARIES ${MKL_LIBRARY}) -MESSAGE(${MKL_LIBRARIES}) -MESSAGE(${MKL_INCLUDE_DIR}) FIND_PACKAGE_HANDLE_STANDARD_ARGS(MKL DEFAULT_MSG MKL_INCLUDE_DIR MKL_LIBRARIES) # avoid local MKL when looking for pytorch #SET(MKL_FOUND TRUE) diff --git a/cmake/FindMKL.cmake b/cmake/FindMKL.cmake index 4c89b18..ea0c72f 100644 --- a/cmake/FindMKL.cmake +++ b/cmake/FindMKL.cmake @@ -49,7 +49,7 @@ set(INTEL_ROOT ${INTEL_ROOT_DEFAULT} CACHE PATH "Folder contains intel libs") find_path(MKL_ROOT include/mkl.h PATHS $ENV{MKLROOT} ${INTEL_ROOT}/mkl $ENV{CONDA_PREFIX} DOC "Folder contains MKL") -MESSAGE(${MKL_ROOT}) +#MESSAGE(${MKL_ROOT}) find_path(MKL_INCLUDE_DIR NAMES mkl.h HINTS ${MKL_ROOT}/include /usr/include/mkl $ENV{CONDA_PREFIX}/include) diff --git a/environment_linux.yml b/environment_linux.yml index 6f6ba00..76781b7 100644 --- a/environment_linux.yml +++ b/environment_linux.yml @@ -4,6 +4,7 @@ channels: - bioconda - defaults dependencies: + - python>=3.9 - pytorch-cpu=1.10 - mkl-devel - tbb-devel diff --git a/environment_macOS.yml b/environment_macOS.yml index b66e121..955dc9a 100644 --- a/environment_macOS.yml +++ b/environment_macOS.yml @@ -4,6 +4,7 @@ channels: - bioconda - defaults dependencies: + - python>=3.9 - pytorch-cpu=1.10 - mkl-devel - tbb-devel diff --git a/ggCaller/__init__.py b/ggCaller/__init__.py index 0ac6919..8e78261 100644 --- a/ggCaller/__init__.py +++ b/ggCaller/__init__.py @@ -2,4 +2,4 @@ '''ggCaller: a gene caller for Bifrost graphs''' -__version__ = '1.3.3' +__version__ = '1.3.4'