Skip to content

Commit 7d25d97

Browse files
committed
[CLN] Rename pykeops_enabled to use_pykeops across codebase
Standardized the naming of the `pykeops_enabled` flag to `use_pykeops` for consistency and clarity in backend configuration. Updated relevant test cases, API calls, and internal logic accordingly.
1 parent 00a6a62 commit 7d25d97

File tree

6 files changed

+17
-15
lines changed

6 files changed

+17
-15
lines changed

gempy_engine/API/interp_single/_interp_scalar_field.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ def interpolate_scalar_field(solver_input: SolverInput, options: InterpolationOp
4343
weights_cached = None
4444
case _:
4545
raise ValueError("Cache mode not recognized")
46-
4746

47+
48+
BackendTensor.pykeops_enabled = False
4849
match weights_cached:
4950
case None:
50-
foo = solver_input.weights_x0
5151
weights = _solve_and_store_weights(
5252
solver_input=solver_input,
5353
kernel_options=options.kernel_options,
@@ -70,6 +70,7 @@ def interpolate_scalar_field(solver_input: SolverInput, options: InterpolationOp
7070

7171
# endregion
7272

73+
BackendTensor.pykeops_enabled = BackendTensor.use_pykeops
7374
exported_fields: ExportedFields = _evaluate_sys_eq(solver_input, weights, options)
7475

7576
return weights, exported_fields

gempy_engine/core/backend_tensor.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ class BackendTensor:
2222
engine_backend: AvailableBackends
2323

2424
pykeops_enabled: bool
25+
use_pykeops: bool = False
2526
use_gpu: bool = True
2627
dtype: str = DEFAULT_TENSOR_DTYPE
2728
dtype_obj: Union[str, "torch.dtype"] = DEFAULT_TENSOR_DTYPE
@@ -46,10 +47,10 @@ def get_backend_string(cls) -> str:
4647

4748
@classmethod
4849
def change_backend_gempy(cls, engine_backend: AvailableBackends, use_gpu: bool = True, dtype: Optional[str] = None):
49-
cls._change_backend(engine_backend, pykeops_enabled=PYKEOPS, use_gpu=use_gpu, dtype=dtype)
50+
cls._change_backend(engine_backend, use_pykeops=PYKEOPS, use_gpu=use_gpu, dtype=dtype)
5051

5152
@classmethod
52-
def _change_backend(cls, engine_backend: AvailableBackends, pykeops_enabled: bool = False, use_gpu: bool = True, dtype: Optional[str] = None):
53+
def _change_backend(cls, engine_backend: AvailableBackends, use_pykeops: bool = False, use_gpu: bool = True, dtype: Optional[str] = None):
5354
cls.dtype = DEFAULT_TENSOR_DTYPE if dtype is None else dtype
5455
cls.dtype_obj = cls.dtype
5556
match engine_backend:
@@ -71,20 +72,20 @@ def _change_backend(cls, engine_backend: AvailableBackends, pykeops_enabled: boo
7172

7273
cls._wrap_numpy_functions()
7374

74-
match (pykeops_enabled, is_pykeops_installed, use_gpu):
75+
match (use_pykeops, is_pykeops_installed, use_gpu):
7576
case (True, True, True):
76-
cls.pykeops_enabled = True
77+
cls.use_pykeops = True
7778
cls.use_gpu = True
7879
cls._wrap_pykeops_functions()
7980
case (True, True, False):
80-
cls.pykeops_enabled = True
81+
cls.use_pykeops = True
8182
cls.use_gpu = False
8283
cls._wrap_pykeops_functions()
8384
case (True, False, _):
8485
raise AttributeError(
8586
f"Engine Backend: {engine_backend} cannot be used because the correspondent library is not installed: pykeops")
8687
case (False, _, _):
87-
cls.pykeops_enabled = False
88+
cls.use_pykeops = False
8889
cls.use_gpu = False
8990

9091
case (engine_backend.PYTORCH):
@@ -98,8 +99,8 @@ def _change_backend(cls, engine_backend: AvailableBackends, pykeops_enabled: boo
9899
cls.dtype_obj = pytorch_copy.float32 if cls.dtype == "float32" else pytorch_copy.float64
99100
cls.tensor_types = pytorch_copy.Tensor
100101

101-
cls.pykeops_enabled = pykeops_enabled # TODO: Make this compatible with pykeops
102-
if (pykeops_enabled):
102+
cls.use_pykeops = use_pykeops # TODO: Make this compatible with pykeops
103+
if (use_pykeops):
103104
import pykeops
104105
cls._wrap_pykeops_functions()
105106

tests/benchmark/profile_runner.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def profile_moureze_model():
2424
BackendTensor._change_backend(
2525
engine_backend=AvailableBackends.numpy,
2626
use_gpu=False,
27-
pykeops_enabled=False
27+
use_pykeops=False
2828
)
2929

3030
model = moureze_model_factory(

tests/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
BackendTensor._change_backend(
2525
engine_backend=backend,
2626
use_gpu=use_gpu,
27-
pykeops_enabled=pykeops_enabled
27+
use_pykeops=pykeops_enabled
2828
)
2929

3030
try:

tests/test_common/test_modules/test_kernel_constructor/test_kernel_constructor.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ def _compare_covariance_item_numpy_pykeops(self, preprocess_data, item, cov_func
185185
sp_internals, ori_internals, options = preprocess_data
186186

187187
# numpy
188-
BackendTensor._change_backend(AvailableBackends.numpy, pykeops_enabled=False)
188+
BackendTensor._change_backend(AvailableBackends.numpy, use_pykeops=False)
189189
solver_input = SolverInput(sp_internals, ori_internals)
190190
kernel_data = cov_vectors_preparation(solver_input, options.kernel_options)
191191
c_n = cov_func(kernel_data, options, item=item)
@@ -198,7 +198,7 @@ def _compare_covariance_item_numpy_pykeops(self, preprocess_data, item, cov_func
198198
c_n_sum = c_n.sum(0).reshape(-1, 1)
199199

200200
# pykeops
201-
BackendTensor._change_backend(AvailableBackends.numpy, pykeops_enabled=True)
201+
BackendTensor._change_backend(AvailableBackends.numpy, use_pykeops=True)
202202
kernel_data = cov_vectors_preparation(solver_input, options.kernel_options)
203203
c_k = cov_func(kernel_data, options, item=item)
204204
c_k_sum = c_n.sum(0).reshape(-1, 1)

tests/test_common/test_modules/test_kernel_constructor/test_kernel_constructor_2.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
class TestCompareWithGempy_v2:
6262
@pytest.fixture(scope="class")
6363
def internals(self, simple_model):
64-
BackendTensor._change_backend(AvailableBackends.numpy, pykeops_enabled=False)
64+
BackendTensor._change_backend(AvailableBackends.numpy, use_pykeops=False)
6565

6666
surface_points = simple_model[0]
6767
orientations = simple_model[1]

0 commit comments

Comments
 (0)