Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix uname issue #201

Merged
merged 4 commits into from
Jun 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion alphadia/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!python

__version__ = "1.6.1"
__version__ = "1.6.2"
6 changes: 5 additions & 1 deletion alphadia/libtransform.py
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,11 @@ def forward(self, input: SpecLibBase) -> SpecLibBase:
# Check if CPU or GPU/MPS should be used
device = "cpu"
if self.use_gpu:
device = "mps" if os.uname().sysname == "Darwin" else "gpu"
try:
device = "mps" if os.uname().sysname == "Darwin" else "gpu"
GeorgWa marked this conversation as resolved.
Show resolved Hide resolved
except AttributeError:
# Windows does not support uname
device = "gpu"

model_mgr = ModelManager(device=device)
if self.checkpoint_folder_path is not None:
Expand Down
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

# AlphaDIA Documentation
**Version:** 1.6.1 | [Github](https://github.com/MannLabs/alphadia)
**Version:** 1.6.2 | [Github](https://github.com/MannLabs/alphadia)

Open-source DIA search engine built with the alphaX ecosystem. Built with [alpharaw](https://github.com/MannLabs/alpharaw) and [alphatims](https://github.com/MannLabs/alphatims) for raw file acces. Spectral libraries are predicted with [peptdeep](https://github.com/MannLabs/alphapeptdeep) and managed by [alphabase](https://github.com/MannLabs/alphabase). Quantification is powered by [directLFQ](https://github.com/MannLabs/directLFQ).

Expand Down
2 changes: 1 addition & 1 deletion gui/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "alphadia",
"productName": "alphadia-gui",
"version": "1.6.1",
"version": "1.6.2",
"description": "Graphical user interface for DIA data analysis",
"main": "dist/electron.js",
"homepage": "./",
Expand Down
2 changes: 1 addition & 1 deletion gui/src/main/modules/profile.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const { dialog } = require('electron')
const Profile = class {

config = {
"version": "1.6.1",
"version": "1.6.2",
"conda": {
"envName": "alpha",
"path": ""
Expand Down
2 changes: 1 addition & 1 deletion misc/.bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 1.6.1
current_version = 1.6.2
commit = True
tag = True
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+)(?P<build>\d+))?
Expand Down
2 changes: 1 addition & 1 deletion release/macos/build_backend_macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ python -c "from huggingface_hub import get_full_repo_name; print('success')"

pip install build
python -m build
pip install "dist/alphadia-1.6.1-py3-none-any.whl[stable]"
pip install "dist/alphadia-1.6.2-py3-none-any.whl[stable]"

# Creating the stand-alone pyinstaller folder
pip install pyinstaller
Expand Down
2 changes: 1 addition & 1 deletion release/macos/build_pkg_macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Set up package name and version
PACKAGE_NAME="alphadia"
PACKAGE_VERSION="1.6.1"
PACKAGE_VERSION="1.6.2"

ARCH=$(uname -m)
if [ "$ARCH" == "x86_64" ]; then
Expand Down
2 changes: 1 addition & 1 deletion release/macos/build_zip_macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Set up package name and version
PACKAGE_NAME="alphadia"
PACKAGE_VERSION="1.6.1"
PACKAGE_VERSION="1.6.2"

ARCH=$(uname -m)
if [ "$ARCH" == "x86_64" ]; then
Expand Down
2 changes: 1 addition & 1 deletion release/macos/distribution.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<installer-script minSpecVersion="1.000000">
<title>alphaDIA 1.6.1</title>
<title>alphaDIA 1.6.2</title>
<background mime-type="image/png" file="alphadia.png" scaling="proportional"/>
<welcome file="welcome.html" mime-type="text/html" />
<conclusion file="conclusion.html" mime-type="text/html" />
Expand Down
4 changes: 2 additions & 2 deletions release/macos/info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<key>CFBundleIconFile</key>
<string>alphadia.icns</string>
<key>CFBundleIdentifier</key>
<string>alphadia.1.6.1</string>
<string>alphadia.1.6.2</string>
<key>CFBundleShortVersionString</key>
<string>1.6.1</string>
<string>1.6.2</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
Expand Down
4 changes: 2 additions & 2 deletions release/windows/alphadia_innoinstaller.iss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

#define MyAppName "AlphaDIA"
#define MyAppVersion "1.6.1"
#define MyAppVersion "1.6.2"
#define MyAppPublisher "Max Planck Institute of Biochemistry, Mann Labs"
#define MyAppURL "https://github.com/MannLabs/alphadia"
#define MyAppExeName "alphadia-gui.exe"
Expand All @@ -25,7 +25,7 @@ LicenseFile=..\..\LICENSE.txt
PrivilegesRequired=lowest
PrivilegesRequiredOverridesAllowed=dialog
OutputDir=..\..\dist
OutputBaseFilename=alphadia-1.6.1-win-x64
OutputBaseFilename=alphadia-1.6.2-win-x64
SetupIconFile=..\logos\alphadia.ico
Compression=lzma
SolidCompression=yes
Expand Down
2 changes: 1 addition & 1 deletion release/windows/build_backend.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ python -c 'from huggingface_hub import get_full_repo_name; print("success")'

pip install build
python -m build
pip install "dist/alphadia-1.6.1-py3-none-any.whl[stable]"
pip install "dist/alphadia-1.6.2-py3-none-any.whl[stable]"

# Creating the stand-alone pyinstaller folder
pip install pyinstaller tbb
Expand Down
Loading