From 1a677ef6ebfade0cd73ac4e85a2dffd2e58157a8 Mon Sep 17 00:00:00 2001 From: "Jae H. Yoo" <40815393+jaeyoo@users.noreply.github.com> Date: Mon, 16 Aug 2021 12:04:10 -0700 Subject: [PATCH 1/3] Update load_module.py --- tensorflow_quantum/core/ops/load_module.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tensorflow_quantum/core/ops/load_module.py b/tensorflow_quantum/core/ops/load_module.py index b5002ad84..faef66652 100644 --- a/tensorflow_quantum/core/ops/load_module.py +++ b/tensorflow_quantum/core/ops/load_module.py @@ -15,6 +15,7 @@ """Module to load python op libraries.""" import os +import sysconfig from distutils.sysconfig import get_python_lib from tensorflow.python.framework import load_library @@ -43,4 +44,6 @@ def load_module(name): except: path = os.path.join(get_python_lib(), "tensorflow_quantum/core/ops", name) + if not os.path.exists(path): + path = path.replace("python3/", f"python{sysconfig.get_python_version()}/") return load_library.load_op_library(path) From 722c04bb343fa08fea9ebd8804a48bebc525ec16 Mon Sep 17 00:00:00 2001 From: "Jae H. Yoo" <40815393+jaeyoo@users.noreply.github.com> Date: Mon, 16 Aug 2021 12:13:29 -0700 Subject: [PATCH 2/3] Update load_module.py --- tensorflow_quantum/core/ops/load_module.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tensorflow_quantum/core/ops/load_module.py b/tensorflow_quantum/core/ops/load_module.py index faef66652..663afe08a 100644 --- a/tensorflow_quantum/core/ops/load_module.py +++ b/tensorflow_quantum/core/ops/load_module.py @@ -42,8 +42,10 @@ def load_module(name): path = resource_loader.get_path_to_datafile(name) return load_library.load_op_library(path) except: - path = os.path.join(get_python_lib(), "tensorflow_quantum/core/ops", + path = os.path.join(get_python_lib(prefix="/usr/local"), + "tensorflow_quantum/core/ops", name) if not os.path.exists(path): - path = path.replace("python3/", f"python{sysconfig.get_python_version()}/") + path = path.replace("python3/", + f"python{sysconfig.get_python_version()}/") return load_library.load_op_library(path) From be3f8903bfcc99d1be3bf4306fcb46cf4f2ec6e4 Mon Sep 17 00:00:00 2001 From: "Jae H. Yoo" <40815393+jaeyoo@users.noreply.github.com> Date: Mon, 16 Aug 2021 13:04:29 -0700 Subject: [PATCH 3/3] Fix format --- tensorflow_quantum/core/ops/load_module.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tensorflow_quantum/core/ops/load_module.py b/tensorflow_quantum/core/ops/load_module.py index 663afe08a..8728a0e84 100644 --- a/tensorflow_quantum/core/ops/load_module.py +++ b/tensorflow_quantum/core/ops/load_module.py @@ -43,8 +43,7 @@ def load_module(name): return load_library.load_op_library(path) except: path = os.path.join(get_python_lib(prefix="/usr/local"), - "tensorflow_quantum/core/ops", - name) + "tensorflow_quantum/core/ops", name) if not os.path.exists(path): path = path.replace("python3/", f"python{sysconfig.get_python_version()}/")