Skip to content

Commit 582c777

Browse files
Merge pull request #1124 from MClemot/torch_linalg
[PyTorch] Compilation fix for recent versions of PyTorch
2 parents 59ba1f1 + 54d76ec commit 582c777

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.github/workflows/test-ubuntu.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ jobs:
6363
- name: Install Torch
6464
shell: bash
6565
run: |
66-
wget https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-2.3.1%2Bcpu.zip
67-
unzip libtorch-cxx11-abi-shared-with-deps-2.3.1+cpu.zip
66+
wget https://download.pytorch.org/libtorch/cpu/libtorch-shared-with-deps-2.9.1%2Bcpu.zip
67+
unzip libtorch-shared-with-deps-2.9.1+cpu.zip
6868
sudo cp -R libtorch/* /usr/local/
6969
7070
- name: Fetch TTK-ParaView headless Debian package
@@ -128,8 +128,8 @@ jobs:
128128
- name: Install Torch
129129
shell: bash
130130
run: |
131-
wget https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-2.3.1%2Bcpu.zip
132-
unzip libtorch-cxx11-abi-shared-with-deps-2.3.1+cpu.zip
131+
wget https://download.pytorch.org/libtorch/cpu/libtorch-shared-with-deps-2.9.1%2Bcpu.zip
132+
unzip libtorch-shared-with-deps-2.9.1+cpu.zip
133133
sudo cp -R libtorch/* /usr/local/
134134
135135
- name: Fetch TTK-ParaView headless Debian package

core/base/mergeTreeAutoencoder/MergeTreeAutoencoder.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1015,7 +1015,7 @@ void ttk::MergeTreeAutoencoder::computeAlphas(
10151015
// Pseudo inverse
10161016
auto driver = "gelsd";
10171017
alphasOut
1018-
= std::get<0>(torch::linalg::lstsq(r_axes, r_data, c10::nullopt, driver));
1018+
= std::get<0>(torch::linalg_lstsq(r_axes, r_data, c10::nullopt, driver));
10191019

10201020
alphasOut.reshape({-1, 1});
10211021
}
@@ -2347,7 +2347,7 @@ void ttk::MergeTreeAutoencoder::createCustomRecs(
23472347
torch::Tensor alphasWeight;
23482348
if(initByTreesAlphas) {
23492349
auto driver = "gelsd";
2350-
alphasWeight = std::get<0>(torch::linalg::lstsq(
2350+
alphasWeight = std::get<0>(torch::linalg_lstsq(
23512351
allTreesAlphas[latLayer].transpose(0, 1),
23522352
alphas, c10::nullopt, driver))
23532353
.transpose(0, 1);
@@ -2371,7 +2371,7 @@ void ttk::MergeTreeAutoencoder::createCustomRecs(
23712371
torch::Tensor maxNorm;
23722372
for(unsigned int j = 0; j < allAlphasInit.size(); ++j) {
23732373
allAlphasInit[j] = torch::randn({vSTensor_[l].sizes()[1], 1});
2374-
auto norm = torch::linalg::vector_norm(
2374+
auto norm = torch::linalg_vector_norm(
23752375
allAlphasInit[j], 2, 0, false, c10::nullopt);
23762376
if(j == 0 or maxNorm.item<float>() < norm.item<float>())
23772377
maxNorm = norm;

0 commit comments

Comments
 (0)