Skip to content

Commit 37719a9

Browse files
committed
remove arch memoizations for now (no effect but the complaint implies some issue with that
1 parent 0a42067 commit 37719a9

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

lib/spack/spack/architecture.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ def from_dict(d):
441441
return arch_for_spec(spec)
442442

443443

444-
@memoized
444+
# @memoized
445445
def get_platform(platform_name):
446446
"""Returns a platform object that corresponds to the given name."""
447447
platform_list = all_platforms()
@@ -477,7 +477,7 @@ def arch_for_spec(arch_spec):
477477
return Arch(arch_plat, arch_spec.os, arch_spec.target)
478478

479479

480-
@memoized
480+
# @memoized
481481
def all_platforms():
482482
classes = []
483483
mod_path = spack.paths.platform_path
@@ -498,7 +498,7 @@ def all_platforms():
498498
return classes
499499

500500

501-
@memoized
501+
# @memoized
502502
def platform():
503503
"""Detects the platform for this machine.
504504
@@ -516,7 +516,7 @@ def platform():
516516
return platform_cls()
517517

518518

519-
@memoized
519+
# @memoized
520520
def sys_type():
521521
"""Print out the "default" platform-os-target tuple for this machine.
522522
@@ -533,7 +533,7 @@ def sys_type():
533533
return str(arch)
534534

535535

536-
@memoized
536+
# @memoized
537537
def compatible_sys_types():
538538
"""Returns a list of all the systypes compatible with the current host."""
539539
compatible_archs = []

lib/spack/spack/test/concretize.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ def current_host(request, monkeypatch):
9696
target = llnl.util.cpu.targets[cpu]
9797

9898
# this function is memoized, so clear its state for testing
99-
spack.architecture.get_platform.cache.clear()
99+
# spack.architecture.get_platform.cache.clear()
100100

101101
if not is_preference:
102102
monkeypatch.setattr(llnl.util.cpu, 'host', lambda: target)
@@ -109,7 +109,7 @@ def current_host(request, monkeypatch):
109109
yield target
110110

111111
# clear any test values fetched
112-
spack.architecture.get_platform.cache.clear()
112+
# spack.architecture.get_platform.cache.clear()
113113

114114

115115
@pytest.mark.usefixtures('config', 'mock_packages')

0 commit comments

Comments
 (0)