not using ray

Author: mwang87

dash/requirements.txt

@@ -18,7 +18,6 @@ celery==5.2.1
 pymzml
 lark-parser
 pyarrow
-ray
 tqdm
 py_expression_eval
 matchms

massql/msql_engine.py

@@ -21,11 +21,6 @@ def DEBUG_MSG(msg):
 
     print(msg, file=sys.stderr, flush=True)
 
-def init_ray():
-    import ray
-    if not ray.is_initialized():
-        ray.init(ignore_reinit_error=True, object_store_memory=8000000000, num_cpus=8)
-
 
 def _get_ppm_tolerance(qualifiers):
     if qualifiers is None:

proteosafe/msql/tools/msql/proteosafe_query.py

@@ -6,7 +6,6 @@
 import glob
 import sys
 import pandas as pd
-import ray
 
 import ming_proteosafe_library
 
@@ -36,25 +35,9 @@ def main():
 
     all_results_list = []
 
-    # Initialize Ray
-    msql_engine.init_ray()
 
     # Parallel Version
-    if len(input_files_list) > 1 and PARALLEL == "YES":
-        all_futures = []
-
-        for input_filename in input_files_list:
-            results_future = execute_query_ray.remote(msql_query, input_filename, path_to_grammar=path_to_grammar, cache=False, parallel=(PARALLEL=="YES"))
-            all_futures.append((results_future, input_filename))
-
-        for result_future, input_filename in all_futures:
-            results_df = ray.get(result_future)
-            real_filename = mangled_mapping[os.path.basename(input_filename)]
-            results_df["filename"] = real_filename
-            results_df["mangled_filename"] = os.path.basename(input_filename)
-
-            all_results_list.append(results_df)
-    else:
+    if True:
         # Serial Version
         all_results_list = []
         for input_filename in input_files_list:

tests/test_query.py

@@ -206,7 +206,6 @@ def test_ms1_iron():
 
 @pytest.mark.skip(reason="parallel not really supported anymore")
 def test_ms1_iron_parallel():
-    msql_engine.init_ray()
 
     query = "QUERY scaninfo(MS1DATA) \
             WHERE \
@@ -235,7 +234,6 @@ def test_ms1_iron_X_changes_intensity():
 
 
 def test_ms1_iron_min_intensity():
-    #msql_engine.init_ray()
 
     query = "QUERY scaninfo(MS1DATA) \
             WHERE \
@@ -254,7 +252,6 @@ def test_ms1_iron_min_intensity():
     assert(len(results_df) == 10)
 
 def test_ms1_iron_min_intensity_m2_prec():
-    #msql_engine.init_ray()
 
     query = "QUERY scaninfo(MS2DATA) \
             WHERE \
@@ -299,7 +296,6 @@ def test_i_norm_iron_xrange():
 
 @pytest.mark.skip(reason="parallel not really supported anymore")
 def test_ms1_cu():
-    msql_engine.init_ray()
 
     query = "QUERY scaninfo(MS1DATA) \
             WHERE \
@@ -698,7 +694,6 @@ def test_mgf_intensity():
     assert(1006 in list(results_df["scan"]))
 
 def main():
-    #msql_engine.init_ray()
 
     #test_noquery()
     #test_simple_ms2_twoqualifier()