Updating scripts.

lemire · lemire · commit 9bfc0a816ffd · 2019-01-17T19:40:38.000-05:00
diff --git a/scripts/data/nuc/pasteandrotate.py b/scripts/data/nuc/pasteandrotate.py
@@ -14,10 +14,15 @@ def getdata(filename):
 ourdir=os.path.dirname(os.path.realpath(__file__))
 answer = []
 for file in os.listdir(ourdir):
+    if file.startswith("all"):
+        continue
     if file.endswith(".table"):
         fullpath = os.path.join(ourdir, file)
         answer.append([file[:-11]]+getdata(fullpath))
 print("#simdjson RapidJSON sajson")
 answer.sort()
 for l in answer:
     print("\t".join(map(str,l)))
+
+
+
diff --git a/scripts/data/skylake/pasteandrotate.py b/scripts/data/skylake/pasteandrotate.py
@@ -1,6 +1,11 @@
 import os
 import csv
-import pandas as pd
+
+try: import pandas as pd
+except ImportError:
+    import pip
+    pip.main(['install', '--user', 'pandas'])
+    import pandas as pd
 
 def getdata(filename):
     df = pd.read_csv(filename, delim_whitespace=True)
@@ -9,10 +14,15 @@ def getdata(filename):
 ourdir=os.path.dirname(os.path.realpath(__file__))
 answer = []
 for file in os.listdir(ourdir):
+    if file.startswith("all"):
+        continue
     if file.endswith(".table"):
         fullpath = os.path.join(ourdir, file)
         answer.append([file[:-11]]+getdata(fullpath))
 print("#simdjson RapidJSON sajson")
 answer.sort()
 for l in answer:
     print("\t".join(map(str,l)))
+
+
+
