eqcctpro 0.4.9__tar.gz → 0.5.0__tar.gz

{eqcctpro-0.4.9 → eqcctpro-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: eqcctpro
-Version: 0.4.9
+Version: 0.5.0
 Summary: EQCCTPro: A powerful seismic event detection toolkit
 Author-email: Constantinos Skevofilax <constantinos.skevofilax@austin.utexas.edu>, Victor Salles <victor.salles@beg.utexas.edu>
 Project-URL: Homepage, https://pypi.org/project/eqcctpro/
@@ -284,24 +284,50 @@ To evaluate your system’s runtime performance capabilites for both your CPU(s)
 from eqcctpro import EvaluateSystem
 
 eval_gpu = EvaluateSystem(
-    mode='gpu',
-    intra_threads=1,
-    inter_threads=1,
-    input_dir='/path/to/mseed',
-    output_dir='/path/to/outputs',
-    log_filepath='/path/to/outputs/eqcctpro.log',
-    csv_dir='/path/to/csv',
-    P_threshold=0.001,
-    S_threshold=0.02,
-    p_model_filepath='/path/to/model_p.h5',
-    s_model_filepath='/path/to/model_s.h5',
-    stations2use=2,
-    cpu_id_list=[0,1],
-    set_vram_mb=24750,
-    selected_gpus=[0]
+                mode='gpu',
+                intra_threads=1,
+                inter_threads=1,
+                input_dir='/path/to/mseed',
+                output_dir='/path/to/outputs',
+                log_filepath='/path/to/outputs/eqcctpro.log',
+                csv_dir='/path/to/csv',
+                P_threshold=0.001,
+                S_threshold=0.02,
+                p_model_filepath='/path/to/model_p.h5',
+                s_model_filepath='/path/to/model_s.h5',
+                stations2use=2,
+                cpu_id_list=[0,1],
+                set_vram_mb=24750,
+                selected_gpus=[0]
 )
 eval_gpu.evaluate()
 ```
+
+```python
+from eqcctpro import EvaluateSystem
+
+eval_cpu = EvaluateSystem(
+                mode='cpu',
+                intra_threads=1,
+                inter_threads=1,
+                input_dir='/path/to/mseed',
+                output_dir='/path/to/outputs',
+                log_filepath='/path/to/outputs/eqcctpro.log',
+                csv_dir='/path/to/csv',
+                P_threshold=0.001,
+                S_threshold=0.02,
+                p_model_filepath='/path/to/model_p.h5',
+                s_model_filepath='/path/to/model_s.h5',
+                stations2use=12,
+                cpu_id_list=range(87,102), 
+                starting_amount_of_stations=2, 
+                station_list_step_size=1,
+                min_cpu_amount=15,
+                min_conc_predictions=2,
+                conc_predictions_step_size=1)
+eval_cpu.evaluate()
+```
+
 **EvaluateSystem** will iterate through different combinations of CPU(s), Concurrent Predictions, and Workloads (stations), as well as GPU(s), and the amount of VRAM (MB) each Concurrent Prediction can use. 
 **EvaluateSystem** will take time, depending on the number of CPU/GPUs, the amount of VRAM available, and the total workload that needs to be tested. However, after doing the testing once for most if not all usecases, 
 the trial data will be available and can be used to identify the optimal input parallelization configurations for **EQCCTMSeedRunner** to use to get the maximum amount of processing out of your system in the shortest amonut of time. 
@@ -356,6 +382,12 @@ The following input parameters need to be configurated for **EvaluateSystem** to
   - Is the minimum amount of CPUs you want to start your trials with 
   - By default, trials will start iterating with 1 CPU up to the maximum allocated 
   - Can now set a value as the starting point, such as 15 CPUs up to the maximum of for instance 25
+- **`min_conc_predictions (int)`: default = 1** 
+  - Is the minimum amount of concurrent predictions you want each trial iteration to start with 
+  - By default, if `min_conc_predictions` and `conc_predictions_step_size` are set to 1, a custom step size iteration will be applied to test the 50 sample waveforms. The sequence follows: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, n+5, 50].
+- **`conc_predictions_step_size (int)`: default = 1** 
+  - Is the concurrent predictions step size you want each trial iteration to iterate with with 
+  - By default, if `min_conc_predictions` and `conc_predictions_step_size` are set to 1, a custom step size iteration will be applied to test the 50 sample waveforms. The sequence follows: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, n+5, 50]
 - **`set_vram_mb (float)`**
   - Value of the maximum amount of VRAM EQCCTPro can use 
   - Must be a real value that is based on your hardware's physical memory space, if it exceeds the space the code will break due to OutOfMemoryError 

{eqcctpro-0.4.9 → eqcctpro-0.5.0}/README.md

@@ -251,24 +251,50 @@ To evaluate your system’s runtime performance capabilites for both your CPU(s)
 from eqcctpro import EvaluateSystem
 
 eval_gpu = EvaluateSystem(
-    mode='gpu',
-    intra_threads=1,
-    inter_threads=1,
-    input_dir='/path/to/mseed',
-    output_dir='/path/to/outputs',
-    log_filepath='/path/to/outputs/eqcctpro.log',
-    csv_dir='/path/to/csv',
-    P_threshold=0.001,
-    S_threshold=0.02,
-    p_model_filepath='/path/to/model_p.h5',
-    s_model_filepath='/path/to/model_s.h5',
-    stations2use=2,
-    cpu_id_list=[0,1],
-    set_vram_mb=24750,
-    selected_gpus=[0]
+                mode='gpu',
+                intra_threads=1,
+                inter_threads=1,
+                input_dir='/path/to/mseed',
+                output_dir='/path/to/outputs',
+                log_filepath='/path/to/outputs/eqcctpro.log',
+                csv_dir='/path/to/csv',
+                P_threshold=0.001,
+                S_threshold=0.02,
+                p_model_filepath='/path/to/model_p.h5',
+                s_model_filepath='/path/to/model_s.h5',
+                stations2use=2,
+                cpu_id_list=[0,1],
+                set_vram_mb=24750,
+                selected_gpus=[0]
 )
 eval_gpu.evaluate()
 ```
+
+```python
+from eqcctpro import EvaluateSystem
+
+eval_cpu = EvaluateSystem(
+                mode='cpu',
+                intra_threads=1,
+                inter_threads=1,
+                input_dir='/path/to/mseed',
+                output_dir='/path/to/outputs',
+                log_filepath='/path/to/outputs/eqcctpro.log',
+                csv_dir='/path/to/csv',
+                P_threshold=0.001,
+                S_threshold=0.02,
+                p_model_filepath='/path/to/model_p.h5',
+                s_model_filepath='/path/to/model_s.h5',
+                stations2use=12,
+                cpu_id_list=range(87,102), 
+                starting_amount_of_stations=2, 
+                station_list_step_size=1,
+                min_cpu_amount=15,
+                min_conc_predictions=2,
+                conc_predictions_step_size=1)
+eval_cpu.evaluate()
+```
+
 **EvaluateSystem** will iterate through different combinations of CPU(s), Concurrent Predictions, and Workloads (stations), as well as GPU(s), and the amount of VRAM (MB) each Concurrent Prediction can use. 
 **EvaluateSystem** will take time, depending on the number of CPU/GPUs, the amount of VRAM available, and the total workload that needs to be tested. However, after doing the testing once for most if not all usecases, 
 the trial data will be available and can be used to identify the optimal input parallelization configurations for **EQCCTMSeedRunner** to use to get the maximum amount of processing out of your system in the shortest amonut of time. 
@@ -323,6 +349,12 @@ The following input parameters need to be configurated for **EvaluateSystem** to
   - Is the minimum amount of CPUs you want to start your trials with 
   - By default, trials will start iterating with 1 CPU up to the maximum allocated 
   - Can now set a value as the starting point, such as 15 CPUs up to the maximum of for instance 25
+- **`min_conc_predictions (int)`: default = 1** 
+  - Is the minimum amount of concurrent predictions you want each trial iteration to start with 
+  - By default, if `min_conc_predictions` and `conc_predictions_step_size` are set to 1, a custom step size iteration will be applied to test the 50 sample waveforms. The sequence follows: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, n+5, 50].
+- **`conc_predictions_step_size (int)`: default = 1** 
+  - Is the concurrent predictions step size you want each trial iteration to iterate with with 
+  - By default, if `min_conc_predictions` and `conc_predictions_step_size` are set to 1, a custom step size iteration will be applied to test the 50 sample waveforms. The sequence follows: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, n+5, 50]
 - **`set_vram_mb (float)`**
   - Value of the maximum amount of VRAM EQCCTPro can use 
   - Must be a real value that is based on your hardware's physical memory space, if it exceeds the space the code will break due to OutOfMemoryError 

{eqcctpro-0.4.9 → eqcctpro-0.5.0}/eqcctpro.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: eqcctpro
-Version: 0.4.9
+Version: 0.5.0
 Summary: EQCCTPro: A powerful seismic event detection toolkit
 Author-email: Constantinos Skevofilax <constantinos.skevofilax@austin.utexas.edu>, Victor Salles <victor.salles@beg.utexas.edu>
 Project-URL: Homepage, https://pypi.org/project/eqcctpro/
@@ -284,24 +284,50 @@ To evaluate your system’s runtime performance capabilites for both your CPU(s)
 from eqcctpro import EvaluateSystem
 
 eval_gpu = EvaluateSystem(
-    mode='gpu',
-    intra_threads=1,
-    inter_threads=1,
-    input_dir='/path/to/mseed',
-    output_dir='/path/to/outputs',
-    log_filepath='/path/to/outputs/eqcctpro.log',
-    csv_dir='/path/to/csv',
-    P_threshold=0.001,
-    S_threshold=0.02,
-    p_model_filepath='/path/to/model_p.h5',
-    s_model_filepath='/path/to/model_s.h5',
-    stations2use=2,
-    cpu_id_list=[0,1],
-    set_vram_mb=24750,
-    selected_gpus=[0]
+                mode='gpu',
+                intra_threads=1,
+                inter_threads=1,
+                input_dir='/path/to/mseed',
+                output_dir='/path/to/outputs',
+                log_filepath='/path/to/outputs/eqcctpro.log',
+                csv_dir='/path/to/csv',
+                P_threshold=0.001,
+                S_threshold=0.02,
+                p_model_filepath='/path/to/model_p.h5',
+                s_model_filepath='/path/to/model_s.h5',
+                stations2use=2,
+                cpu_id_list=[0,1],
+                set_vram_mb=24750,
+                selected_gpus=[0]
 )
 eval_gpu.evaluate()
 ```
+
+```python
+from eqcctpro import EvaluateSystem
+
+eval_cpu = EvaluateSystem(
+                mode='cpu',
+                intra_threads=1,
+                inter_threads=1,
+                input_dir='/path/to/mseed',
+                output_dir='/path/to/outputs',
+                log_filepath='/path/to/outputs/eqcctpro.log',
+                csv_dir='/path/to/csv',
+                P_threshold=0.001,
+                S_threshold=0.02,
+                p_model_filepath='/path/to/model_p.h5',
+                s_model_filepath='/path/to/model_s.h5',
+                stations2use=12,
+                cpu_id_list=range(87,102), 
+                starting_amount_of_stations=2, 
+                station_list_step_size=1,
+                min_cpu_amount=15,
+                min_conc_predictions=2,
+                conc_predictions_step_size=1)
+eval_cpu.evaluate()
+```
+
 **EvaluateSystem** will iterate through different combinations of CPU(s), Concurrent Predictions, and Workloads (stations), as well as GPU(s), and the amount of VRAM (MB) each Concurrent Prediction can use. 
 **EvaluateSystem** will take time, depending on the number of CPU/GPUs, the amount of VRAM available, and the total workload that needs to be tested. However, after doing the testing once for most if not all usecases, 
 the trial data will be available and can be used to identify the optimal input parallelization configurations for **EQCCTMSeedRunner** to use to get the maximum amount of processing out of your system in the shortest amonut of time. 
@@ -356,6 +382,12 @@ The following input parameters need to be configurated for **EvaluateSystem** to
   - Is the minimum amount of CPUs you want to start your trials with 
   - By default, trials will start iterating with 1 CPU up to the maximum allocated 
   - Can now set a value as the starting point, such as 15 CPUs up to the maximum of for instance 25
+- **`min_conc_predictions (int)`: default = 1** 
+  - Is the minimum amount of concurrent predictions you want each trial iteration to start with 
+  - By default, if `min_conc_predictions` and `conc_predictions_step_size` are set to 1, a custom step size iteration will be applied to test the 50 sample waveforms. The sequence follows: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, n+5, 50].
+- **`conc_predictions_step_size (int)`: default = 1** 
+  - Is the concurrent predictions step size you want each trial iteration to iterate with with 
+  - By default, if `min_conc_predictions` and `conc_predictions_step_size` are set to 1, a custom step size iteration will be applied to test the 50 sample waveforms. The sequence follows: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, n+5, 50]
 - **`set_vram_mb (float)`**
   - Value of the maximum amount of VRAM EQCCTPro can use 
   - Must be a real value that is based on your hardware's physical memory space, if it exceeds the space the code will break due to OutOfMemoryError 

{eqcctpro-0.4.9 → eqcctpro-0.5.0}/eqcctpro.egg-info/SOURCES.txt

@@ -1,6 +1,5 @@
 README.md
 pyproject.toml
-setup.py
 eqcctpro/__init__.py
 eqcctpro.egg-info/PKG-INFO
 eqcctpro.egg-info/SOURCES.txt

{eqcctpro-0.4.9 → eqcctpro-0.5.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "eqcctpro"
-version = "0.4.9"
+version = "0.5.0"
 description = "EQCCTPro: A powerful seismic event detection toolkit"
 readme = "README.md"
 requires-python = ">=3.10.14"

eqcctpro-0.4.9/setup.py

@@ -1,60 +0,0 @@
-from setuptools import setup, find_packages
-import os
-import sys
-
-# Ensure the user has the latest Python version
-REQUIRED_PYTHON = (3, 10, 14)  # Change this to the minimum version you require
-
-if sys.version_info < REQUIRED_PYTHON:
-    sys.stderr.write(f"""
-==========================
-Unsupported Python version
-==========================
-This package requires Python {REQUIRED_PYTHON[0]}.{REQUIRED_PYTHON[1]}.{REQUIRED_PYTHON[2]} or higher.
-You are using Python {sys.version_info.major}.{sys.version_info.minor}.
-Please upgrade Python and try again.
-
-Visit https://www.python.org/downloads/ to install the latest version.
-""")
-    sys.exit(1)
-
-# Ensure TensorFlow and CUDA are initialized before running
-os.environ["TF_CPP_MIN_LOG_LEVEL"] = "3"
-os.environ["TF_ENABLE_ONEDNN_OPTS"] = "1"
-os.environ["CUDA_DEVICE_ORDER"] = "PCI_BUS_ID"
-os.environ["NVIDIA_LOG_LEVEL"] = "ERROR"
-os.environ["CUDA_MODULE_LOADING"] = "LAZY"
-
-with open("README.md", "r") as f:
-    description = f.read()
-
-setup(
-    name="eqcctpro",
-    version="0.4.4",
-    packages=find_packages(),
-    install_requires=[
-        "numpy==1.26.4",
-        "pandas==2.2.3",
-        "matplotlib==3.10.0",
-        "obspy==1.4.1",
-        "progress==1.6",
-        "psutil==6.1.1",
-        "ray==2.42.1",
-        "schedule==1.2.2",
-        "sdnotify==0.3.2",
-        "tensorflow>=2.15,<2.19",  # Updated TensorFlow constraint
-        "tensorflow-estimator>=2.15,<2.19",  # Updated TensorFlow Estimator constraint
-        "tensorflow-io-gcs-filesystem==0.37.1",
-        "tensorboard==2.15.2",
-        "tensorboard-data-server==0.7.2",
-        "silence-tensorflow==1.2.3",
-        "scipy==1.15.1",
-        "protobuf==4.25.6",
-        "grpcio==1.70.0",
-        "absl-py==2.1.0",
-        "h5py==3.12.1",
-        "pynvml==12.0.0",
-    ],
-    long_description=description,
-    long_description_content_type="text/markdown"
-)