solve prepare_dataset_np issue

CaiLiLab · Mar 25, 2023 · 0d2caac · 0d2caac
1 parent b8a0637
commit 0d2caac
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/MuRaL/preprocessing.py b/MuRaL/preprocessing.py
@@ -827,13 +827,8 @@ def prepare_dataset_h5(bed_regions, ref_genome, bw_paths, bw_files, bw_names, bw
     return dataset
 
 
-<<<<<<< HEAD
 def prepare_dataset_np(bed_regions, ref_genome, bw_files, bw_names, bw_radii, local_radius=5, local_order=1, distal_radius=50, distal_order=1, seq_only=False, without_bw_distal=False):
-    """Prepare the datasets for given regions, using H5 file"""
-=======
-def prepare_dataset_np(bed_regions, ref_genome, bw_files, bw_names, local_radius=5, local_order=1, distal_radius=50, distal_order=1,seq_only=False):
     """Prepare the datasets for given regions, without an H5 file"""
->>>>>>> cbfeba181f6a98649acb4b3170f206559c5bcb39
 
     # Prepare local data
     data_local, seq_cols, categorical_features, output_feature = prepare_local_data(bed_regions, ref_genome, bw_files, bw_names, bw_radii, local_radius, local_order, seq_only)