Skip to content

Replace pkg_resources file ref with pathlib #758

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Replace pkg_resources file ref with pathlib #758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54824a5
replace pkg_resources file ref with pathlib
timmysilv Jul 21, 2025
fd916d0
Update strawberryfields/apps/data/feature.py
timmysilv Jul 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions strawberryfields/apps/data/feature.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@
"""
# pylint: disable=unnecessary-pass
from abc import ABC, abstractmethod
import pkg_resources
from pathlib import Path

import numpy as np

DATA_PATH = pkg_resources.resource_filename("strawberryfields", "apps/data/feature_data") + "/"
DATA_PATH = Path(__file__).parent / "feature_data"


class FeatureDataset(ABC):
Expand Down Expand Up @@ -87,9 +88,9 @@ def method(self) -> str:

def __init__(self):
self.vectors = np.load(
f"{DATA_PATH}{self._data_filename}_{self.method}_fv.npy", allow_pickle=True
DATA_PATH / f"{self._data_filename}_{self.method}_fv.npy", allow_pickle=True
)
self.adjs = np.load(DATA_PATH + self._data_filename + "_mat.npy", allow_pickle=True)
self.adjs = np.load(DATA_PATH / f"{self._data_filename}_mat.npy", allow_pickle=True)
self.n_vectors, self.n_features = self.vectors.shape

def __iter__(self):
Expand Down
40 changes: 20 additions & 20 deletions strawberryfields/apps/data/sample.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
"""
# pylint: disable=unnecessary-pass
from abc import ABC, abstractmethod
from pathlib import Path

import pkg_resources
import numpy as np
import scipy

DATA_PATH = pkg_resources.resource_filename("strawberryfields", "apps/data/sample_data") + "/"
DATA_PATH = Path(__file__).parent / "sample_data"


class SampleDataset(ABC):
Expand Down Expand Up @@ -53,7 +53,7 @@ def _data_filename(self) -> str:
pass

def __init__(self):
self.data = scipy.sparse.load_npz(DATA_PATH + self._data_filename + ".npz")
self.data = scipy.sparse.load_npz(DATA_PATH / f"{self._data_filename}.npz")
self.n_samples, self.modes = self.data.shape

def __iter__(self):
Expand Down Expand Up @@ -124,7 +124,7 @@ class GraphDataset(SampleDataset, ABC):

def __init__(self):
super().__init__()
self.adj = scipy.sparse.load_npz(DATA_PATH + self._data_filename + "_A.npz").toarray()
self.adj = scipy.sparse.load_npz(DATA_PATH / f"{self._data_filename}_A.npz").toarray()


class Planted(GraphDataset):
Expand Down Expand Up @@ -333,11 +333,11 @@ class MoleculeDataset(SampleDataset, ABC):

def __init__(self):
super().__init__()
self.w = scipy.sparse.load_npz(DATA_PATH + self._data_filename + "_w.npz").toarray()[0]
self.wp = scipy.sparse.load_npz(DATA_PATH + self._data_filename + "_wp.npz").toarray()[0]
self.Ud = scipy.sparse.load_npz(DATA_PATH + self._data_filename + "_Ud.npz").toarray()
self.w = scipy.sparse.load_npz(DATA_PATH / f"{self._data_filename}_w.npz").toarray()[0]
self.wp = scipy.sparse.load_npz(DATA_PATH / f"{self._data_filename}_wp.npz").toarray()[0]
self.Ud = scipy.sparse.load_npz(DATA_PATH / f"{self._data_filename}_Ud.npz").toarray()
self.delta = scipy.sparse.load_npz(
DATA_PATH + self._data_filename + "_delta.npz"
DATA_PATH / f"{self._data_filename}_delta.npz"
).toarray()[0]

# pylint: disable=missing-docstring
Expand Down Expand Up @@ -409,14 +409,14 @@ def __init__(self, t):
)
index = self._times_to_indices[t]

all_data = np.load(DATA_PATH + "water.npz")["arr_0"]
all_data = np.load(DATA_PATH / "water.npz")["arr_0"]

self.data = all_data[index]
self.data = scipy.sparse.csr_matrix(self.data)
self.n_samples, self.modes = self.data.shape

self.w = scipy.sparse.load_npz(DATA_PATH + "water_w.npz").toarray()[0]
self.U = scipy.sparse.load_npz(DATA_PATH + "water_U.npz").toarray()
self.w = scipy.sparse.load_npz(DATA_PATH / "water_w.npz").toarray()[0]
self.U = scipy.sparse.load_npz(DATA_PATH / "water_U.npz").toarray()

n_mean = 1 / 3
threshold = False
Expand Down Expand Up @@ -461,20 +461,20 @@ def __init__(self, t):
)
index = self._times_to_indices[t]

all_data = np.load(DATA_PATH + "pyrrole.npz")["arr_0"]
all_data = np.load(DATA_PATH / "pyrrole.npz")["arr_0"]

self.data = all_data[index]
self.data = scipy.sparse.csr_matrix(self.data)
self.n_samples, self.modes = self.data.shape

self.ri = scipy.sparse.load_npz(DATA_PATH + "pyrrole_ri.npz").toarray()[0]
self.rf = scipy.sparse.load_npz(DATA_PATH + "pyrrole_rf.npz").toarray()[0]
self.wi = scipy.sparse.load_npz(DATA_PATH + "pyrrole_wi.npz").toarray()[0]
self.wf = scipy.sparse.load_npz(DATA_PATH + "pyrrole_wf.npz").toarray()[0]
self.Li = scipy.sparse.load_npz(DATA_PATH + "pyrrole_Li.npz").toarray()
self.Lf = scipy.sparse.load_npz(DATA_PATH + "pyrrole_Lf.npz").toarray()
self.m = scipy.sparse.load_npz(DATA_PATH + "pyrrole_m.npz").toarray()[0]
self.U = scipy.sparse.load_npz(DATA_PATH + "pyrrole_U.npz").toarray()
self.ri = scipy.sparse.load_npz(DATA_PATH / "pyrrole_ri.npz").toarray()[0]
self.rf = scipy.sparse.load_npz(DATA_PATH / "pyrrole_rf.npz").toarray()[0]
self.wi = scipy.sparse.load_npz(DATA_PATH / "pyrrole_wi.npz").toarray()[0]
self.wf = scipy.sparse.load_npz(DATA_PATH / "pyrrole_wf.npz").toarray()[0]
self.Li = scipy.sparse.load_npz(DATA_PATH / "pyrrole_Li.npz").toarray()
self.Lf = scipy.sparse.load_npz(DATA_PATH / "pyrrole_Lf.npz").toarray()
self.m = scipy.sparse.load_npz(DATA_PATH / "pyrrole_m.npz").toarray()[0]
self.U = scipy.sparse.load_npz(DATA_PATH / "pyrrole_U.npz").toarray()

n_mean = 0.12599583
threshold = False
Expand Down
Loading