From 38da17d7d9b0684c8e76ecb5c3014f13c2345226 Mon Sep 17 00:00:00 2001 From: Laurent FAINSIN Date: Thu, 6 Apr 2023 09:31:16 +0200 Subject: [PATCH] fix: change hardcoded compiler path --- README.md | 4 ++-- metrics/ChamferDistancePytorch/chamfer2D/setup.py | 2 +- metrics/ChamferDistancePytorch/chamfer3D/dist_chamfer_3D.py | 2 +- metrics/ChamferDistancePytorch/chamfer3D/setup.py | 2 +- metrics/ChamferDistancePytorch/chamfer5D/setup.py | 2 +- modules/functional/backend.py | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 8beadc3..92965f6 100644 --- a/README.md +++ b/README.md @@ -19,8 +19,8 @@ mamba env create --file env.yml Install PyTorchEMD by ```bash cd metrics/PyTorchEMD -module load gcc -module load mpfr +module load gcc/11.2.0 +module load mpfr/4.0.2 conda activate PVD python setup.py install cp build/**/emd_cuda.cpython-*-x86_64-linux-gnu.so . diff --git a/metrics/ChamferDistancePytorch/chamfer2D/setup.py b/metrics/ChamferDistancePytorch/chamfer2D/setup.py index 6fca431..1b729b3 100644 --- a/metrics/ChamferDistancePytorch/chamfer2D/setup.py +++ b/metrics/ChamferDistancePytorch/chamfer2D/setup.py @@ -10,7 +10,7 @@ setup( ]), ], - extra_cuda_cflags=['--compiler-bindir=/usr/bin/gcc-8'], + extra_cuda_cflags=['--compiler-bindir=/softs/gcc/11.2.0/bin/gcc'], cmdclass={ 'build_ext': BuildExtension }) \ No newline at end of file diff --git a/metrics/ChamferDistancePytorch/chamfer3D/dist_chamfer_3D.py b/metrics/ChamferDistancePytorch/chamfer3D/dist_chamfer_3D.py index f3f7587..5811e46 100644 --- a/metrics/ChamferDistancePytorch/chamfer3D/dist_chamfer_3D.py +++ b/metrics/ChamferDistancePytorch/chamfer3D/dist_chamfer_3D.py @@ -15,7 +15,7 @@ if not chamfer_found: "/".join(os.path.abspath(__file__).split('/')[:-1] + ["chamfer3D.cu"]), ], - extra_cuda_cflags=['--compiler-bindir=/usr/bin/gcc-8'],) + extra_cuda_cflags=['--compiler-bindir=/softs/gcc/11.2.0/bin/gcc'],) print("Loaded JIT 3D CUDA chamfer distance") else: diff --git a/metrics/ChamferDistancePytorch/chamfer3D/setup.py b/metrics/ChamferDistancePytorch/chamfer3D/setup.py index 0200b9f..7d3723e 100644 --- a/metrics/ChamferDistancePytorch/chamfer3D/setup.py +++ b/metrics/ChamferDistancePytorch/chamfer3D/setup.py @@ -10,7 +10,7 @@ setup( ]), ], - extra_cuda_cflags=['--compiler-bindir=/usr/bin/gcc-8'], + extra_cuda_cflags=['--compiler-bindir=/softs/gcc/11.2.0/bin/gcc'], cmdclass={ 'build_ext': BuildExtension }) \ No newline at end of file diff --git a/metrics/ChamferDistancePytorch/chamfer5D/setup.py b/metrics/ChamferDistancePytorch/chamfer5D/setup.py index 51f5960..297aa33 100644 --- a/metrics/ChamferDistancePytorch/chamfer5D/setup.py +++ b/metrics/ChamferDistancePytorch/chamfer5D/setup.py @@ -10,7 +10,7 @@ setup( ]), ], - extra_cuda_cflags=['--compiler-bindir=/usr/bin/gcc-8'], + extra_cuda_cflags=['--compiler-bindir=/softs/gcc/11.2.0/bin/gcc'], cmdclass={ 'build_ext': BuildExtension }) \ No newline at end of file diff --git a/modules/functional/backend.py b/modules/functional/backend.py index 794e0d6..d6232ca 100644 --- a/modules/functional/backend.py +++ b/modules/functional/backend.py @@ -5,7 +5,7 @@ from torch.utils.cpp_extension import load _src_path = os.path.dirname(os.path.abspath(__file__)) _backend = load(name='_pvcnn_backend', extra_cflags=['-O3', '-std=c++17'], - extra_cuda_cflags=['--compiler-bindir=/usr/bin/gcc-8'], + extra_cuda_cflags=['--compiler-bindir=/softs/gcc/11.2.0/bin/gcc'], sources=[os.path.join(_src_path,'src', f) for f in [ 'ball_query/ball_query.cpp', 'ball_query/ball_query.cu',