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

submodule update #166

Merged
merged 6 commits into from
May 12, 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
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ jobs:
- name: "macOS Monterey 12 avx"
os: macos-12
arch: "core-avx-i"
- name: "macOS Big Sur 11.0 avx"
os: macos-11.0
- name: "macOS Ventura 13 avx"
os: macos-13
arch: "core-avx-i"
- name: "macOS Big Sur 11.0 x86-64"
os: macos-11.0
- name: "macOS Ventura 13 x86-64"
os: macos-13
arch: "x86-64"
- name: "macOS Monterey 12 avx"
os: macos-12
Expand Down Expand Up @@ -217,7 +217,7 @@ jobs:
# https://software.intel.com/content/www/us/en/develop/articles/installing-intel-free-libs-and-python-apt-repo.html
- name: Install MKL
run: |
wget -qO- "https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB" | sudo apt-key add -
wget -qO- "https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB" | sudo apt-key add -
sudo sh -c "echo deb https://apt.repos.intel.com/mkl all main > /etc/apt/sources.list.d/intel-mkl.list"
sudo apt-get update -o Dir::Etc::sourcelist="/etc/apt/sources.list.d/intel-mkl.list"
sudo apt-get install -y --no-install-recommends intel-mkl-64bit-2020.0-088
Expand Down
2 changes: 1 addition & 1 deletion src/inventory/ModelManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ ModelManager::ModelManager(QObject *parent, Settings * settings)
, settings_(settings)
, isFetchingRemoteModels_(false)
{
appDataDir_ = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
appDataDir_.setPath(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation));
if (!QDir(appDataDir_).exists()) {
if (QFileInfo::exists(appDataDir_.absolutePath())) {
std::cerr << "We want to store data at a directory at: " << appDataDir_.absolutePath().toStdString() << " but a file with the same name exists." << std::endl;
Expand Down
Loading