Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactored to remove __future__ from annotations library #609

Merged
merged 1 commit into from
Jul 12, 2022
Merged

Refactored to remove __future__ from annotations library #609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions compiler/definitions/ir/nodes/dgsh_tee.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from datatypes_new.AccessKind import AccessKind
from datatypes_new.AccessKind import make_stream_output, make_stream_input
from datatypes_new.BasicDatatypes import Flag, ArgStringType
from datatypes_new.BasicDatatypesWithIO import OptionWithIO
from datatypes_new.CommandInvocationWithIOVars import CommandInvocationWithIOVars
Expand All @@ -19,8 +19,8 @@ def __init__(self,
def make_dgsh_tee_node(input_id, output_id):
dgsh_tee_bin = os.path.join(config.PASH_TOP, config.config['runtime']['dgsh_tee_binary'])

access_map = {output_id: AccessKind.make_stream_output(),
input_id: AccessKind.make_stream_input()}
access_map = {output_id: make_stream_output(),
input_id: make_stream_input()}

flag_option_list = [OptionWithIO("-i", input_id),
OptionWithIO("-o", output_id),
Expand Down
8 changes: 4 additions & 4 deletions compiler/definitions/ir/nodes/eager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from datatypes_new.AccessKind import AccessKind
from datatypes_new.AccessKind import AccessKind, make_stream_output, make_stream_input, make_other_output
from datatypes_new.CommandInvocationWithIOVars import CommandInvocationWithIOVars

from definitions.ir.dfg_node import *
Expand All @@ -18,9 +18,9 @@ def make_eager_node(input_id, output_id, intermediate_file_id, eager_exec_path):
eager_name = eager_exec_path
intermediate_file_id_id = intermediate_file_id.get_ident()
operand_list = [input_id, output_id, intermediate_file_id_id]
access_map = {output_id: AccessKind.make_stream_output(),
input_id: AccessKind.make_stream_input(),
intermediate_file_id_id: AccessKind.make_other_output()}
access_map = {output_id: make_stream_output(),
input_id: make_stream_input(),
intermediate_file_id_id: make_other_output()}
cmd_inv_with_io_vars = CommandInvocationWithIOVars(
cmd_name=eager_name,
flag_option_list=[],
Expand Down
6 changes: 3 additions & 3 deletions compiler/definitions/ir/nodes/r_merge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from datatypes_new.AccessKind import AccessKind
from datatypes_new.AccessKind import make_stream_input, make_stream_output
from datatypes_new.CommandInvocationWithIOVars import CommandInvocationWithIOVars

from definitions.ir.dfg_node import *
Expand All @@ -20,8 +20,8 @@ def __init__(self,
def make_r_merge_node(inputs, output):
r_merge_bin = os.path.join(config.PASH_TOP, config.config['runtime']['r_merge_binary'])
# TODO: assume that the inputs and output is provided as operands
access_map = {input_id: AccessKind.make_stream_input() for input_id in inputs}
access_map[output] = AccessKind.make_stream_output()
access_map = {input_id: make_stream_input() for input_id in inputs}
access_map[output] = make_stream_output()
cmd_inv_with_io_vars = CommandInvocationWithIOVars(
cmd_name=r_merge_bin,
flag_option_list=[],
Expand Down
6 changes: 3 additions & 3 deletions compiler/definitions/ir/nodes/r_split.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import os

from datatypes_new.AccessKind import AccessKind
from datatypes_new.AccessKind import AccessKind, make_stream_input, make_stream_output
from datatypes_new.BasicDatatypes import Operand, Flag
from datatypes_new.CommandInvocationWithIOVars import CommandInvocationWithIOVars

Expand Down Expand Up @@ -33,8 +33,8 @@ def make_r_split(input_id, out_ids, r_split_batch_size):
operand_list = [input_id,
Operand(Arg(string_to_argument(str(r_split_batch_size))))]
operand_list.extend(out_ids)
access_map = {output_id: AccessKind.make_stream_output() for output_id in out_ids}
access_map[input_id] = AccessKind.make_stream_input()
access_map = {output_id: make_stream_output() for output_id in out_ids}
access_map[input_id] = make_stream_input()
cmd_inv_with_io_vars = CommandInvocationWithIOVars(
cmd_name=r_split_bin,
flag_option_list=[],
Expand Down
4 changes: 2 additions & 2 deletions compiler/definitions/ir/nodes/r_unwrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from datatypes_new.AccessKind import AccessKind
from datatypes_new.AccessKind import make_stream_input, make_stream_output
from datatypes_new.CommandInvocationWithIOVars import CommandInvocationWithIOVars

from definitions.ir.dfg_node import *
Expand All @@ -21,7 +21,7 @@ def __init__(self,
def make_unwrap_node(inputs, output):
assert(len(inputs) == 1)
input_id = inputs[0]
access_map = {input_id: AccessKind.make_stream_input(), output: AccessKind.make_stream_output()}
access_map = {input_id: make_stream_input(), output: make_stream_output()}
r_unwrap_bin = os.path.join(config.PASH_TOP, config.config['runtime']['r_unwrap_binary'])
cmd_inv_with_io_vars = CommandInvocationWithIOVars(
cmd_name=r_unwrap_bin,
Expand Down
4 changes: 2 additions & 2 deletions compiler/definitions/ir/nodes/r_wrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from datatypes_new.AccessKind import AccessKind
from datatypes_new.AccessKind import make_stream_output, make_stream_input
from datatypes_new.BasicDatatypes import ArgStringType
from datatypes_new.CommandInvocationWithIOVars import CommandInvocationWithIOVars

Expand Down Expand Up @@ -45,7 +45,7 @@ def wrap_node(node: DFGNode, edges):
## TODO: changed this from <= to == 1 to simplify reasoning later for now
assert(len(outputs) == 1)
output_id = outputs[0]
access_map = {input_id: AccessKind.make_stream_input(), output_id: AccessKind.make_stream_output()}
access_map = {input_id: make_stream_input(), output_id: make_stream_output()}

#create bash -c argument
cmd_inv_with_io_vars: CommandInvocationWithIOVars = node.cmd_invocation_with_io_vars
Expand Down