From 2c6757172608a4444f9ba9ba856bb3c932c7a6d5 Mon Sep 17 00:00:00 2001 From: Robert Cohn Date: Sun, 11 Feb 2024 11:23:53 -0500 Subject: [oneapi]: make headers match oneapi vars.sh (#42614) * [oneapi]: make headers match oneapi vars.sh * update * update --- var/spack/repos/builtin/packages/intel-oneapi-dal/package.py | 11 +++++++++++ var/spack/repos/builtin/packages/intel-oneapi-dnn/package.py | 9 ++++++++- var/spack/repos/builtin/packages/intel-oneapi-dpl/package.py | 11 ++++++++--- var/spack/repos/builtin/packages/intel-oneapi-mpi/package.py | 6 ------ 4 files changed, 27 insertions(+), 10 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/intel-oneapi-dal/package.py b/var/spack/repos/builtin/packages/intel-oneapi-dal/package.py index 1c509113d0..025a81814f 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-dal/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-dal/package.py @@ -117,3 +117,14 @@ class IntelOneapiDal(IntelOneApiLibraryPackage): @property def component_dir(self): return "dal" + + @property + def headers(self): + # This should match the directories added to CPATH by + # env/vars.sh for the component + if self.v2_layout: + dirs = [self.component_prefix.include, self.component_prefix.include.dal] + else: + dirs = [self.component_prefix.include] + + return self.header_directories(dirs) diff --git a/var/spack/repos/builtin/packages/intel-oneapi-dnn/package.py b/var/spack/repos/builtin/packages/intel-oneapi-dnn/package.py index 81764743dc..80da187cd2 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-dnn/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-dnn/package.py @@ -123,7 +123,14 @@ class IntelOneapiDnn(IntelOneApiLibraryPackage): @property def headers(self): - return find_headers("dnnl", self.__target().include) + # This should match the directories added to CPATH by + # env/vars.sh for the component + if self.v2_layout: + dirs = [self.component_prefix.include] + else: + dirs = [self.component_prefix.cpu_dpcpp_gpu_dpcpp.include] + + return self.header_directories(dirs) @property def libs(self): diff --git a/var/spack/repos/builtin/packages/intel-oneapi-dpl/package.py b/var/spack/repos/builtin/packages/intel-oneapi-dpl/package.py index 42b778222c..83a6252caf 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-dpl/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-dpl/package.py @@ -93,6 +93,11 @@ class IntelOneapiDpl(IntelOneApiLibraryPackage): @property def headers(self): - return self.header_directories( - [self.component_prefix.include, self.component_prefix.linux.include] - ) + # This should match the directories added to CPATH by + # env/vars.sh for the component + if self.v2_layout: + dirs = [self.component_prefix.include] + else: + dirs = [self.component_prefix.linux.include] + + return self.header_directories(dirs) diff --git a/var/spack/repos/builtin/packages/intel-oneapi-mpi/package.py b/var/spack/repos/builtin/packages/intel-oneapi-mpi/package.py index ab3c438bdf..e41d6dd21c 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-mpi/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-mpi/package.py @@ -167,12 +167,6 @@ class IntelOneapiMpi(IntelOneApiLibraryPackage): env.set("I_MPI_ROOT", self.component_prefix) - @property - def headers(self): - return self.header_directories( - [self.component_prefix.include, self.component_prefix.include.ilp64] - ) - @property def libs(self): libs = [] -- cgit v1.2.3-70-g09d2