zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make/ninja: use the right number of jobs (#34057)

Browse Source
This commit is contained in:
Harmen Stoppels 2022-11-23 12:35:15 +01:00 committed by GitHub
parent fe1c105161
commit 55c77d659e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
var/spack/repos/builtin/packages/gmake/package.py
View File

@ -5,7 +5,7 @@
import re import re
from spack.build_environment import MakeExecutable from spack.build_environment import MakeExecutable, determine_number_of_jobs
from spack.package import * from spack.package import *
@ -89,5 +89,9 @@ def symlink_gmake(self):
symlink("make", "gmake") symlink("make", "gmake")
def setup_dependent_package(self, module, dspec): def setup_dependent_package(self, module, dspec):
module.make = MakeExecutable(self.spec.prefix.bin.make, make_jobs) module.make = MakeExecutable(
module.gmake = MakeExecutable(self.spec.prefix.bin.gmake, make_jobs) self.spec.prefix.bin.make, determine_number_of_jobs(parallel=dspec.package.parallel)
)
module.gmake = MakeExecutable(
self.spec.prefix.bin.gmake, determine_number_of_jobs(parallel=dspec.package.parallel)
)

4
var/spack/repos/builtin/packages/ninja-fortran/package.py
View File

@ -3,7 +3,9 @@
# #
# SPDX-License-Identifier: (Apache-2.0 OR MIT) # SPDX-License-Identifier: (Apache-2.0 OR MIT)
from spack.build_environment import MakeExecutable, determine_number_of_jobs
from spack.package import * from spack.package import *
from spack.util.executable import which_string
class NinjaFortran(Package): class NinjaFortran(Package):
@ -92,6 +94,6 @@ def setup_dependent_package(self, module, dspec):
module.ninja = MakeExecutable( module.ninja = MakeExecutable(
which_string(name, path=[self.spec.prefix.bin], required=True), which_string(name, path=[self.spec.prefix.bin], required=True),
determine_number_of_jobs(parallel=self.parallel), determine_number_of_jobs(parallel=dspec.package.parallel),
supports_jobserver=True, # This fork supports jobserver supports_jobserver=True, # This fork supports jobserver
) )

2
var/spack/repos/builtin/packages/ninja/package.py
View File

@ -79,6 +79,6 @@ def setup_dependent_package(self, module, dspec):
module.ninja = MakeExecutable( module.ninja = MakeExecutable(
which_string(name, path=[self.spec.prefix.bin], required=True), which_string(name, path=[self.spec.prefix.bin], required=True),
determine_number_of_jobs(parallel=self.parallel), determine_number_of_jobs(parallel=dspec.package.parallel),
supports_jobserver=self.spec.version == ver("kitware"), supports_jobserver=self.spec.version == ver("kitware"),
) )