Skip to content

Commit 41f5f22

Browse files
sourabhtk37sourabhtk37
committed
Change directory structure to add subpackages
Add MANIFEST.in Signed-off-by: T K Sourab <[email protected]>
1 parent c412a8f commit 41f5f22

35 files changed

+66
-62
lines changed

‎MANIFEST.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
include *.in
2+
include *.py
3+
include *.txt

‎config/__init__.py renamed to ‎quisby/benchmarks/__init__.py

File renamed without changes.

‎credentials/__init__.py renamed to ‎quisby/benchmarks/linpack/__init__.py

File renamed without changes.

‎linpack/comparison.py renamed to ‎quisby/benchmarks/linpack/comparison.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import config.config as config
2-
from sheet.sheetapi import sheet
3-
from sheet.sheet_util import read_sheet, create_spreadsheet, append_to_sheet, clear_sheet_charts, clear_sheet_data, get_sheet
4-
from graph import graph_linpack_data, rearrange_linpack_data
1+
import quisby.config as config
2+
from quisby.sheet.sheetapi import sheet
3+
from quisby.sheet.sheet_util import read_sheet, create_spreadsheet, append_to_sheet, clear_sheet_charts, clear_sheet_data, get_sheet
4+
from quisby.benchmarks.linpack.graph import rearrange_linpack_data
55

66

77
def graph_linpack_comparison(spreadsheetId, range='A:F'):

‎linpack/extract.py renamed to ‎quisby/benchmarks/linpack/extract.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import csv
22

3-
from pricing import cloud_pricing
4-
from config.config import cloud_type, region
3+
from quisby.pricing import cloud_pricing
4+
import quisby.config as config
55

66

77
def extract_linpack_summary_data(path, system_name):
@@ -20,8 +20,8 @@ def extract_linpack_summary_data(path, system_name):
2020

2121
if gflops:
2222
get_cloud_pricing = getattr(
23-
cloud_pricing, 'get_%s_pricing' % cloud_type.lower())
24-
price_per_hour = get_cloud_pricing(system_name, region)
23+
cloud_pricing, 'get_%s_pricing' % config.cloud_type.lower())
24+
price_per_hour = get_cloud_pricing(system_name, config.region)
2525

2626
results.append(system_name)
2727
results.append(gflops)

‎linpack/graph.py renamed to ‎quisby/benchmarks/linpack/graph.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
from itertools import groupby
22

3-
import config.config as config
4-
from sheet.sheetapi import sheet
5-
from sheet.sheet_util import clear_sheet_charts, clear_sheet_data, append_to_sheet, read_sheet, get_sheet
3+
import quisby.config as config
4+
from quisby.sheet.sheetapi import sheet
5+
from quisby.sheet.sheet_util import clear_sheet_charts, clear_sheet_data, append_to_sheet, read_sheet, get_sheet
66

77

88
# TODO: remove mention of range with test_name

‎linpack/summary.py renamed to ‎quisby/benchmarks/linpack/summary.py

File renamed without changes.

‎linpack/__init__.py renamed to ‎quisby/benchmarks/pig/__init__.py

File renamed without changes.

‎pig/comparison.py renamed to ‎quisby/benchmarks/pig/comparison.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
from itertools import groupby
22

3-
import config.config as config
4-
from sheet.sheet_util import create_spreadsheet, append_to_sheet, read_sheet, get_sheet
5-
from util.util import combine_two_array_alternating
6-
from pig.graph import graph_pig_data
3+
import quisby.config as config
4+
from quisby.sheet.sheet_util import create_spreadsheet, append_to_sheet, read_sheet, get_sheet
5+
from quisby.util import combine_two_array_alternating
6+
from quisby.pig.graph import graph_pig_data
77

88

99
def compare_pig_results(spreadsheets):

‎pig/extract.py renamed to ‎quisby/benchmarks/pig/extract.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import re
22

3-
import config.config as config
3+
import quisby.config as config
44

55

66
def extract_pig_data(test_path, system_name):

‎pig/graph.py renamed to ‎quisby/benchmarks/pig/graph.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from sheet.sheetapi import sheet
2-
from sheet.sheet_util import read_sheet, clear_sheet_charts, get_sheet
1+
from quisby.sheet.sheetapi import sheet
2+
from quisby.sheet.sheet_util import read_sheet, clear_sheet_charts, get_sheet
33

44

55
def create_series_range_pig(column_count, sheetId, start_index, end_index):

‎pig/summary.py renamed to ‎quisby/benchmarks/pig/summary.py

File renamed without changes.

‎pig/__init__.py renamed to ‎quisby/benchmarks/specjbb/__init__.py

File renamed without changes.

‎specjbb/comparison.py renamed to ‎quisby/benchmarks/specjbb/comparison.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
from itertools import groupby
22

3-
import config.config as config
4-
from sheet_util import create_spreadsheet, append_to_sheet, read_sheet, get_sheet
5-
from util.util import combine_two_array_alternating
6-
from graph import graph_specjbb_data
3+
import quisby.config as config
4+
from quisby.sheet_util import create_spreadsheet, append_to_sheet, read_sheet, get_sheet
5+
from quisby.util import combine_two_array_alternating
6+
from quisby.benchmarks.specjbb.graph import graph_specjbb_data
77

88

99
def compare_specjbb_results(spreadsheets, test_name, table_name=[]):

‎specjbb/graph.py renamed to ‎quisby/benchmarks/specjbb/graph.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
from itertools import groupby
22

3-
import config.config as config
4-
from sheet.sheetapi import sheet
5-
from sheet.sheet_util import clear_sheet_charts, append_to_sheet, read_sheet, get_sheet
3+
import quisby.config as config
4+
from quisby.sheet.sheetapi import sheet
5+
from quisby.sheet.sheet_util import clear_sheet_charts, append_to_sheet, read_sheet, get_sheet
66

77

88
def create_series_range_list_specjbb(column_count, sheetId, start_index, end_index):

‎specjbb/specjbb.py renamed to ‎quisby/benchmarks/specjbb/specjbb.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from itertools import groupby
22

3-
import config.config as config
4-
from pricing.cloud_pricing import get_aws_pricing
3+
import quisby.config as config
4+
from quisby.pricing.cloud_pricing import get_aws_pricing
55

66

77
def specjbb_sort_data_by_system_family(results):

‎pricing/__init__.py renamed to ‎quisby/benchmarks/stream/__init__.py

File renamed without changes.

‎stream/comparison.py renamed to ‎quisby/benchmarks/stream/comparison.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
from itertools import groupby
22

3-
import config.config as config
4-
from sheet_util import create_spreadsheet, append_to_sheet, read_sheet, get_sheet
5-
from util.util import combine_two_array_alternating
6-
from graph import graph_stream_data
3+
import quisby.config as config
4+
from quisby.sheet_util import create_spreadsheet, append_to_sheet, read_sheet, get_sheet
5+
from quisby.util import combine_two_array_alternating
6+
from quisby.benchmarks.stream.graph import graph_stream_data
77

88

99
def compare_stream_results(spreadsheets, test_name, table_name=['Max Througput']):

‎stream/graph.py renamed to ‎quisby/benchmarks/stream/graph.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
from itertools import groupby
22

3-
import config.config as config
4-
from sheet.sheetapi import sheet
5-
from sheet.sheet_util import clear_sheet_charts, append_to_sheet, read_sheet, get_sheet
3+
import quisby.config as config
4+
from quisby.sheet.sheetapi import sheet
5+
from quisby.sheet.sheet_util import clear_sheet_charts, append_to_sheet, read_sheet, get_sheet
66

77

88
def create_series_range_list_stream(column_index, len_of_func, sheetId, start_index, end_index):

‎stream/stream.py renamed to ‎quisby/benchmarks/stream/stream.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from itertools import groupby
2-
import config.config as config
2+
3+
import quisby.config as config
34

45

56
def stream_sort_data_by_system_family(results):

‎sheet/__init__.py renamed to ‎quisby/benchmarks/uperf/__init__.py

File renamed without changes.

‎uperf/comparison.py renamed to ‎quisby/benchmarks/uperf/comparison.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
from itertools import groupby
22

3-
import config.config as config
4-
from sheet_util import create_spreadsheet, append_to_sheet, read_sheet, get_sheet
5-
from util.util import combine_two_array_alternating
6-
from graph import graph_uperf_data
3+
import quisby.config as config
4+
from quisby.sheet_util import create_spreadsheet, append_to_sheet, read_sheet, get_sheet
5+
from quisby.util import combine_two_array_alternating
6+
from quisby.benchmarks.uperf.graph import graph_uperf_data
77

88

99
def compare_uperf_results(spreadsheets):

‎uperf/graph.py renamed to ‎quisby/benchmarks/uperf/graph.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
from itertools import groupby
22

3-
import config.config as config
4-
from sheet.sheetapi import sheet
5-
from .uperf import combine_uperf_data
6-
from sheet.sheet_util import clear_sheet_charts, clear_sheet_data, append_to_sheet, read_sheet, get_sheet
3+
import quisby.config as config
4+
from quisby.sheet.sheetapi import sheet
5+
from quisby.benchmarks.uperf.uperf import combine_uperf_data
6+
from quisby.sheet.sheet_util import clear_sheet_charts, clear_sheet_data, append_to_sheet, read_sheet, get_sheet
77

88

99
def series_range_uperf(column_count, sheetId, start_index, end_index):

‎uperf/uperf.py renamed to ‎quisby/benchmarks/uperf/uperf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import csv
22
from itertools import groupby
33

4-
import config.config as config
4+
import quisby.config as config
55

66

77
def combine_uperf_data(results):

‎config/config.py renamed to ‎quisby/config.py

File renamed without changes.

‎specjbb/__init__.py renamed to ‎quisby/credentials/__init__.py

File renamed without changes.

‎credentials/creds.py renamed to ‎quisby/credentials/creds.py

File renamed without changes.

‎stream/__init__.py renamed to ‎quisby/pricing/__init__.py

File renamed without changes.

‎pricing/cloud_pricing.py renamed to ‎quisby/pricing/cloud_pricing.py

File renamed without changes.

‎quisby/quisby.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
import sys
22

3-
import config.config as config
4-
from sheet.sheetapi import sheet
5-
from sheet.sheet_util import create_sheet, append_to_sheet, create_spreadsheet
6-
from stream.stream import extract_stream_data, create_summary_stream_data
7-
from stream.graph import graph_stream_data
8-
from uperf.uperf import extract_uperf_data, create_summary_uperf_data
9-
from uperf.graph import graph_uperf_data
10-
from specjbb.specjbb import extract_specjbb_data, create_summary_specjbb_data
11-
from specjbb.graph import graph_specjbb_data
12-
from pig.extract import extract_pig_data
13-
from pig.graph import graph_pig_data
14-
from pig.summary import create_summary_pig_data
15-
from linpack.extract import extract_linpack_summary_data
16-
from linpack.summary import create_summary_linpack_data
17-
from linpack.graph import graph_linpack_data
3+
import quisby.config as config
4+
from quisby.sheet.sheetapi import sheet
5+
from quisby.sheet.sheet_util import create_sheet, append_to_sheet, create_spreadsheet
6+
from quisby.benchmarks.stream.stream import extract_stream_data, create_summary_stream_data
7+
from quisby.benchmarks.stream.graph import graph_stream_data
8+
from quisby.benchmarks.uperf.uperf import extract_uperf_data, create_summary_uperf_data
9+
from quisby.benchmarks.uperf.graph import graph_uperf_data
10+
from quisby.benchmarks.specjbb.specjbb import extract_specjbb_data, create_summary_specjbb_data
11+
from quisby.benchmarks.specjbb.graph import graph_specjbb_data
12+
from quisby.benchmarks.pig.extract import extract_pig_data
13+
from quisby.benchmarks.pig.graph import graph_pig_data
14+
from quisby.benchmarks.pig.summary import create_summary_pig_data
15+
from quisby.benchmarks.linpack.extract import extract_linpack_summary_data
16+
from quisby.benchmarks.linpack.summary import create_summary_linpack_data
17+
from quisby.benchmarks.linpack.graph import graph_linpack_data
1818

1919

2020
def process_results(results):

‎uperf/__init__.py renamed to ‎quisby/sheet/__init__.py

File renamed without changes.

‎sheet/sheet_util.py renamed to ‎quisby/sheet/sheet_util.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import config.config as config
2-
from .sheetapi import sheet
1+
import quisby.config as config
2+
from quisby.sheet.sheetapi import sheet
33

44
LINPACK_HEADER_ROW = ["System", "GFLOPS",
55
"GFLOP Scaling", "Cost/hr", "Price/Perf"]

‎sheet/sheetapi.py renamed to ‎quisby/sheet/sheetapi.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from googleapiclient.discovery import build
22

3-
from credentials.creds import authenticate_creds
3+
from quisby.credentials.creds import authenticate_creds
44

55

66
creds = authenticate_creds()

‎util/util.py renamed to ‎quisby/util.py

File renamed without changes.

‎util/__init__.py

Whitespace-only changes.

0 commit comments

Comments
 (0)