Skip to content

Commit 3e1a1ef

Browse files
committed
fix : fix imports and renamings after refactoring
1 parent 0030c41 commit 3e1a1ef

9 files changed

Lines changed: 21 additions & 292 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ adheres to semantic versioning once it reaches 1.0.
1818
- **PR #19/20**: Upgraded Rung-3 counterfactuals to use *continuous* vibration RMS outcomes instead of binary labels, enabling direction-sensible physical deltas.
1919
- Universal `Dataset` contract (`Dataset.from_arrays`) so any vibration dataset
2020
plugs in without a bespoke loader.
21-
- Validation scripts for CWRU (`validate_run.py`) and SEU gears
21+
- Validation scripts for CWRU (`validate_cwru.py`) and SEU gears
2222
(`validate_seu.py`), and a cross-condition robustness script.
2323
- Test suite covering the physics, symbolic, causal, consensus, and provider
2424
layers.

docs/generate_paper_tables.py

Lines changed: 0 additions & 213 deletions
This file was deleted.

examples/cross_rig.py

Lines changed: 0 additions & 65 deletions
This file was deleted.

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
author='Abhimanyu Prasad, Kazi Tasfin Mahmud',
2222
url='https://github.com/abhiprd2000/CNSD',
2323
license='MIT',
24-
packages=find_packages(),
24+
packages=find_packages(include=['cnsd', 'cnsd.*']),
2525
python_requires='>=3.11',
2626
install_requires=['numpy>=2.0', 'scipy>=1.11', 'scikit-learn>=1.4', 'pyyaml>=6.0'],
2727
extras_require=extras,

validation/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
"""CNSD validation and benchmark scripts (not shipped in the wheel)."""

validation/multi_seed_benchmark.py

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
import numpy as np
77
import scipy.stats as stats
88

9-
try:
9+
10+
def main():
1011
os.environ['TF_CPP_MIN_LOG_LEVEL'] = '2'
1112
import tensorflow as tf
1213

1314
from cnsd import Dataset
1415
from cnsd.diagnosis.system import CNSD
1516
from cnsd.perception.cnn import _train_cnn
1617

17-
# Argparse
1818
parser = argparse.ArgumentParser()
1919
parser.add_argument('--dataset', type=str, required=True, choices=['cwru', 'pu', 'xjtusy'])
2020
args = parser.parse_args()
@@ -23,7 +23,7 @@
2323

2424
if args.dataset == 'pu':
2525
from cnsd.physics import PhysicsConfig
26-
from validate_pu import load_pu_domain_split
26+
from validation.validate_pu import load_pu_domain_split
2727

2828
(X_train_full, y_train_full, cond_train_full), (X_target, y_target, cond_target) = (
2929
load_pu_domain_split()
@@ -40,7 +40,7 @@
4040
fs = 64000
4141

4242
elif args.dataset == 'cwru':
43-
from validate_run import CWRU, TAXONOMY, load_cwru
43+
from validation.validate_cwru import CWRU, TAXONOMY, load_cwru
4444

4545
X, y, cond = load_cwru()
4646
X = np.asarray(X, np.float32)
@@ -339,7 +339,11 @@ def clone_for_mc(layer):
339339
print('================ DONE ================')
340340

341341
except Exception:
342-
with open('crash_traceback.txt', 'w') as f:
343-
traceback.print_exc(file=f)
344-
print('CRASHED. Check crash_traceback.txt')
345-
sys.exit(1)
342+
with open('crash_traceback.txt', 'w') as f:
343+
traceback.print_exc(file=f)
344+
print('CRASHED. Check crash_traceback.txt')
345+
sys.exit(1)
346+
347+
348+
if __name__ == '__main__':
349+
main()

validation/validate_cwru.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""
2-
validate_run.py - one clean end-to-end validation of the CNSD pipeline on CWRU.
2+
validate_cwru.py - one clean end-to-end validation of the CNSD pipeline on CWRU.
33
44
Purpose: prove the rebuilt system actually RUNS on real data and produces the
55
numbers the paper claims - before writing the paper. This is a validation run,
@@ -33,7 +33,7 @@ def load_cwru():
3333

3434
from scipy.io import loadmat
3535

36-
base_dir = r'E:\301\CWRU-dataset'
36+
base_dir = os.environ.get('CNSD_DATA_CWRU', r'E:\301\CWRU-dataset')
3737
if not os.path.exists(base_dir):
3838
raise FileNotFoundError(f'CWRU dataset not found at {base_dir}')
3939

validation/validate_pu.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@
99
from cnsd.physics import PhysicsConfig
1010

1111

12-
def load_pu_domain_split(data_dir=r'E:\301\PU-dataset', window_size=8192):
12+
def load_pu_domain_split(data_dir=None, window_size=8192):
1313
"""
1414
Loads authentic PU dataset and strictly splits by RPM (Domain Shift).
1515
Train: N09 (900 RPM)
1616
Test/Calib: N15 (1500 RPM)
1717
"""
18+
if data_dir is None:
19+
data_dir = os.environ.get('CNSD_DATA_PU', r'E:\301\PU-dataset')
1820
X_train, y_train, cond_train = [], [], []
1921
X_target, y_target, cond_target = [], [], []
2022

validation/validate_seu.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def load_seu():
5252
containing 'Data' (~line 16), data starts the next line. Pick one channel
5353
(pre-commit to it before seeing results - no channel cherry-picking).
5454
"""
55-
base_dir = r'E:\301\SEU-dataset\gearbox\gearset'
55+
base_dir = os.environ.get('CNSD_DATA_SEU', r'E:\301\SEU-dataset\gearbox\gearset')
5656

5757
label_map = {'Health': 0, 'Chipped': 1, 'Miss': 2, 'Root': 3, 'Surface': 4}
5858
X_list, y_list, cond_list = [], [], []

0 commit comments

Comments
 (0)