Upload 3 files

Master_MIDI_Dataset_GPU_Search_and_Filter.ipynb

@@ -11,7 +11,7 @@
         "id": "SiTIpPjArIyr"
       },
       "source": [
-        "# Master MIDI Dataset GPU Search and Filter (ver. 6.0)\n",
+        "# Master MIDI Dataset GPU Search and Filter (ver. 7.0)\n",
         "\n",
         "***\n",
         "\n",
@@ -282,7 +282,7 @@
         "print('Loading signatures...')\n",
         "print('=' * 70)\n",
         "\n",
-        "signatures_data = cp.array(sigs_matrixes)\n",
+        "signatures_data_full = cp.array(sigs_matrixes)\n",
         "\n",
         "print('Done!')\n",
         "print('=' * 70)"
@@ -319,6 +319,25 @@
         "\n",
         "###########\n",
         "\n",
+        "search_settings_string = ''\n",
+        "\n",
+        "if match_drums:\n",
+        "  search_settings_string += 'Chords_Drums'\n",
+        "else:\n",
+        "  search_settings_string += 'Chords'\n",
+        "\n",
+        "if search_matching_type == 'Distances':\n",
+        "  search_settings_string += '_O_' + str(distances_norm_order)\n",
+        "\n",
+        "search_settings_string += '_W_'\n",
+        "search_settings_string += str(match_results_weight) + '_'\n",
+        "search_settings_string += str(match_lengths_weight) + '_'\n",
+        "search_settings_string += str(match_counts_weight)\n",
+        "\n",
+        "search_settings_string += '_E_' + str(epsilon)\n",
+        "\n",
+        "###########\n",
+        "\n",
         "print('Loading MIDI files...')\n",
         "print('This may take a while on a large dataset in particular.')\n",
         "\n",
@@ -341,8 +360,8 @@
         "\n",
         "  ###################\n",
         "\n",
-        "  if not os.path.exists('/content/Output-MIDI-Dataset/'+search_matching_type):\n",
-        "      os.makedirs('/content/Output-MIDI-Dataset/'+search_matching_type)\n",
+        "  if not os.path.exists('/content/Output-MIDI-Dataset/'+search_matching_type+'_'+search_settings_string):\n",
+        "      os.makedirs('/content/Output-MIDI-Dataset/'+search_matching_type+'_'+search_settings_string)\n",
         "\n",
         "  ###################\n",
         "\n",
@@ -390,7 +409,7 @@
         "            for c in cscore:\n",
         "\n",
         "              pitches = sorted(set([p[4] for p in c if p[3] != 9]))\n",
-        "              drums = sorted(set([p[4] for p in c if p[3] == 9]))\n",
+        "              drums = sorted(set([p[4]+drums_offset for p in c if p[3] == 9]))\n",
         "\n",
         "              if pitches:\n",
         "                if len(pitches) > 1:\n",
@@ -424,7 +443,10 @@
         "          src_signatures = cp.stack(cp.array(src_sigs))\n",
         "\n",
         "          if not match_drums:\n",
-        "            src_signatures = cp.where(src_signatures < drums_offset, src_signatures, epsilon)\n",
+        "            src_signatures = src_signatures[:,:drums_offset]\n",
+        "            signatures_data = signatures_data_full[:,:drums_offset]\n",
+        "          else:\n",
+        "            signatures_data = signatures_data_full\n",
         "\n",
         "          #=======================================================\n",
         "\n",
@@ -447,9 +469,6 @@
         "\n",
         "          for target_sig in tqdm(src_signatures):\n",
         "\n",
-        "            if not match_drums:\n",
-        "              target_sig = cp.where(target_sig < drums_offset, target_sig, epsilon)\n",
-        "\n",
         "            comps_lengths = cp.vstack((cp.repeat(cp.sum(target_sig != 0), signatures_data.shape[0]), cp.sum(signatures_data != 0, axis=1)))\n",
         "            comps_lengths_ratios = cp.divide(cp.min(comps_lengths, axis=0), cp.max(comps_lengths, axis=0))\n",
         "\n",
@@ -496,9 +515,9 @@
         "\n",
         "            filtered_means = sorted_means[(sorted_means >= lower_threshold) & (sorted_means <= upper_threshold)][:filter_size]\n",
         "\n",
-        "            filtered_idxs = cp.where(cp.in1d(results, filtered_means))[0]\n",
+        "            filtered_idxs = cp.nonzero(cp.in1d(results, filtered_means))[0]\n",
         "\n",
-        "            all_filtered_means.extend(results[cp.in1d(results, filtered_means)].tolist())\n",
+        "            all_filtered_means.extend(results[filtered_idxs].tolist())\n",
         "\n",
         "            all_filtered_idxs.extend(filtered_idxs.tolist())\n",
         "\n",
@@ -545,7 +564,7 @@
         "            #=======================================================\n",
         "\n",
         "            dir_str = str(fn1)\n",
-        "            copy_path = '/content/Output-MIDI-Dataset/'+search_matching_type+'/'+dir_str\n",
+        "            copy_path = '/content/Output-MIDI-Dataset/'+search_matching_type+'_'+search_settings_string+'/'+dir_str\n",
         "            if not os.path.exists(copy_path):\n",
         "                os.mkdir(copy_path)\n",
         "\n",
@@ -678,9 +697,9 @@
         "\n",
         "number_of_top_matches_MIDIs_to_collect = 30 #@param {type:\"slider\", min:5, max:50, step:1}\n",
         "maximum_match_ratio_to_search_for = 1 #@param {type:\"slider\", min:0, max:1, step:0.001}\n",
-        "match_results_weight = 1 # @param {type:\"slider\", min:0.1, max:3, step:0.1}\n",
-        "match_lengths_weight = 0.5 # @param {type:\"slider\", min:0.1, max:3, step:0.1}\n",
-        "match_counts_weight = 0.5 # @param {type:\"slider\", min:0.1, max:3, step:0.1}\n",
+        "match_results_weight = 2 # @param {type:\"slider\", min:0.1, max:3, step:0.1}\n",
+        "match_lengths_weight = 1 # @param {type:\"slider\", min:0.1, max:3, step:0.1}\n",
+        "match_counts_weight = 1 # @param {type:\"slider\", min:0.1, max:3, step:0.1}\n",
         "epsilon = 0.5 # @param {type:\"slider\", min:0.001, max:1, step:0.001}\n",
         "\n",
         "print('=' * 70)\n",
@@ -689,6 +708,19 @@
         "\n",
         "###########\n",
         "\n",
+        "search_settings_string = ''\n",
+        "\n",
+        "search_settings_string += str(search_matching_type).replace('-', '_')\n",
+        "\n",
+        "search_settings_string += '_W_'\n",
+        "search_settings_string += str(match_results_weight) + '_'\n",
+        "search_settings_string += str(match_lengths_weight) + '_'\n",
+        "search_settings_string += str(match_counts_weight)\n",
+        "\n",
+        "search_settings_string += '_E_' + str(epsilon)\n",
+        "\n",
+        "###########\n",
+        "\n",
         "print('Loading MIDI files...')\n",
         "print('This may take a while on a large dataset in particular.')\n",
         "\n",
@@ -711,8 +743,8 @@
         "\n",
         "  ###################\n",
         "\n",
-        "  if not os.path.exists('/content/Output-MIDI-Dataset/'+search_matching_type):\n",
-        "      os.makedirs('/content/Output-MIDI-Dataset/'+search_matching_type)\n",
+        "  if not os.path.exists('/content/Output-MIDI-Dataset/'+search_settings_string):\n",
+        "      os.makedirs('/content/Output-MIDI-Dataset/'+search_settings_string)\n",
         "\n",
         "  ###################\n",
         "\n",
@@ -828,9 +860,9 @@
         "\n",
         "            filtered_means = sorted_means[(sorted_means >= lower_threshold) & (sorted_means <= upper_threshold)][:filter_size]\n",
         "\n",
-        "            filtered_idxs = cp.where(cp.in1d(results, filtered_means))[0]\n",
+        "            filtered_idxs = cp.nonzero(cp.in1d(results, filtered_means))[0]\n",
         "\n",
-        "            all_filtered_means.extend(results[cp.in1d(results, filtered_means)].tolist())\n",
+        "            all_filtered_means.extend(results[filtered_idxs].tolist())\n",
         "\n",
         "            all_filtered_idxs.extend(filtered_idxs.tolist())\n",
         "\n",
@@ -877,7 +909,7 @@
         "            #=======================================================\n",
         "\n",
         "            dir_str = str(fn1)\n",
-        "            copy_path = '/content/Output-MIDI-Dataset/'+search_matching_type+'/'+dir_str\n",
+        "            copy_path = '/content/Output-MIDI-Dataset/'+search_settings_string+'/'+dir_str\n",
         "            if not os.path.exists(copy_path):\n",
         "                os.mkdir(copy_path)\n",
         "\n",

master_midi_dataset_gpu_search_and_filter.py

@@ -6,7 +6,7 @@ Automatically generated by Colaboratory.
 Original file is located at
     https://colab.research.google.com/github/asigalov61/Los-Angeles-MIDI-Dataset/blob/main/Extras/Master_MIDI_Dataset_GPU_Search_and_Filter.ipynb
 
-# Master MIDI Dataset GPU Search and Filter (ver. 6.0)
+# Master MIDI Dataset GPU Search and Filter (ver. 7.0)
 
 ***
 
@@ -165,7 +165,7 @@ print('=' * 70)
 print('Loading signatures...')
 print('=' * 70)
 
-signatures_data = cp.array(sigs_matrixes)
+signatures_data_full = cp.array(sigs_matrixes)
 
 print('Done!')
 print('=' * 70)
@@ -192,6 +192,25 @@ print('=' * 70)
 
 ###########
 
+search_settings_string = ''
+
+if match_drums:
+  search_settings_string += 'Chords_Drums'
+else:
+  search_settings_string += 'Chords'
+
+if search_matching_type == 'Distances':
+  search_settings_string += '_O_' + str(distances_norm_order)
+
+search_settings_string += '_W_'
+search_settings_string += str(match_results_weight) + '_'
+search_settings_string += str(match_lengths_weight) + '_'
+search_settings_string += str(match_counts_weight)
+
+search_settings_string += '_E_' + str(epsilon)
+
+###########
+
 print('Loading MIDI files...')
 print('This may take a while on a large dataset in particular.')
 
@@ -214,8 +233,8 @@ if filez:
 
   ###################
 
-  if not os.path.exists('/content/Output-MIDI-Dataset/'+search_matching_type):
-      os.makedirs('/content/Output-MIDI-Dataset/'+search_matching_type)
+  if not os.path.exists('/content/Output-MIDI-Dataset/'+search_matching_type+'_'+search_settings_string):
+      os.makedirs('/content/Output-MIDI-Dataset/'+search_matching_type+'_'+search_settings_string)
 
   ###################
 
@@ -263,7 +282,7 @@ if filez:
             for c in cscore:
 
               pitches = sorted(set([p[4] for p in c if p[3] != 9]))
-              drums = sorted(set([p[4] for p in c if p[3] == 9]))
+              drums = sorted(set([p[4]+drums_offset for p in c if p[3] == 9]))
 
               if pitches:
                 if len(pitches) > 1:
@@ -297,7 +316,10 @@ if filez:
           src_signatures = cp.stack(cp.array(src_sigs))
 
           if not match_drums:
-            src_signatures = cp.where(src_signatures < drums_offset, src_signatures, epsilon)
+            src_signatures = src_signatures[:,:drums_offset]
+            signatures_data = signatures_data_full[:,:drums_offset]
+          else:
+            signatures_data = signatures_data_full
 
           #=======================================================
 
@@ -320,9 +342,6 @@ if filez:
 
           for target_sig in tqdm(src_signatures):
 
-            if not match_drums:
-              target_sig = cp.where(target_sig < drums_offset, target_sig, epsilon)
-
             comps_lengths = cp.vstack((cp.repeat(cp.sum(target_sig != 0), signatures_data.shape[0]), cp.sum(signatures_data != 0, axis=1)))
             comps_lengths_ratios = cp.divide(cp.min(comps_lengths, axis=0), cp.max(comps_lengths, axis=0))
 
@@ -369,9 +388,9 @@ if filez:
 
             filtered_means = sorted_means[(sorted_means >= lower_threshold) & (sorted_means <= upper_threshold)][:filter_size]
 
-            filtered_idxs = cp.where(cp.in1d(results, filtered_means))[0]
+            filtered_idxs = cp.nonzero(cp.in1d(results, filtered_means))[0]
 
-            all_filtered_means.extend(results[cp.in1d(results, filtered_means)].tolist())
+            all_filtered_means.extend(results[filtered_idxs].tolist())
 
             all_filtered_idxs.extend(filtered_idxs.tolist())
 
@@ -418,7 +437,7 @@ if filez:
             #=======================================================
 
             dir_str = str(fn1)
-            copy_path = '/content/Output-MIDI-Dataset/'+search_matching_type+'/'+dir_str
+            copy_path = '/content/Output-MIDI-Dataset/'+search_matching_type+'_'+search_settings_string+'/'+dir_str
             if not os.path.exists(copy_path):
                 os.mkdir(copy_path)
 
@@ -524,9 +543,9 @@ print('=' * 70)
 
 number_of_top_matches_MIDIs_to_collect = 30 #@param {type:"slider", min:5, max:50, step:1}
 maximum_match_ratio_to_search_for = 1 #@param {type:"slider", min:0, max:1, step:0.001}
-match_results_weight = 1 # @param {type:"slider", min:0.1, max:3, step:0.1}
-match_lengths_weight = 0.5 # @param {type:"slider", min:0.1, max:3, step:0.1}
-match_counts_weight = 0.5 # @param {type:"slider", min:0.1, max:3, step:0.1}
+match_results_weight = 2 # @param {type:"slider", min:0.1, max:3, step:0.1}
+match_lengths_weight = 1 # @param {type:"slider", min:0.1, max:3, step:0.1}
+match_counts_weight = 1 # @param {type:"slider", min:0.1, max:3, step:0.1}
 epsilon = 0.5 # @param {type:"slider", min:0.001, max:1, step:0.001}
 
 print('=' * 70)
@@ -535,6 +554,19 @@ print('=' * 70)
 
 ###########
 
+search_settings_string = ''
+
+search_settings_string += str(search_matching_type).replace('-', '_')
+
+search_settings_string += '_W_'
+search_settings_string += str(match_results_weight) + '_'
+search_settings_string += str(match_lengths_weight) + '_'
+search_settings_string += str(match_counts_weight)
+
+search_settings_string += '_E_' + str(epsilon)
+
+###########
+
 print('Loading MIDI files...')
 print('This may take a while on a large dataset in particular.')
 
@@ -557,8 +589,8 @@ if filez:
 
   ###################
 
-  if not os.path.exists('/content/Output-MIDI-Dataset/'+search_matching_type):
-      os.makedirs('/content/Output-MIDI-Dataset/'+search_matching_type)
+  if not os.path.exists('/content/Output-MIDI-Dataset/'+search_settings_string):
+      os.makedirs('/content/Output-MIDI-Dataset/'+search_settings_string)
 
   ###################
 
@@ -674,9 +706,9 @@ if filez:
 
             filtered_means = sorted_means[(sorted_means >= lower_threshold) & (sorted_means <= upper_threshold)][:filter_size]
 
-            filtered_idxs = cp.where(cp.in1d(results, filtered_means))[0]
+            filtered_idxs = cp.nonzero(cp.in1d(results, filtered_means))[0]
 
-            all_filtered_means.extend(results[cp.in1d(results, filtered_means)].tolist())
+            all_filtered_means.extend(results[filtered_idxs].tolist())
 
             all_filtered_idxs.extend(filtered_idxs.tolist())
 
@@ -723,7 +755,7 @@ if filez:
             #=======================================================
 
             dir_str = str(fn1)
-            copy_path = '/content/Output-MIDI-Dataset/'+search_matching_type+'/'+dir_str
+            copy_path = '/content/Output-MIDI-Dataset/'+search_settings_string+'/'+dir_str
             if not os.path.exists(copy_path):
                 os.mkdir(copy_path)