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

Jump to bottom

[Renewed] Refactor preprocessor architecture to enhance extensibility #694

Merged
merged 5 commits into from
Oct 30, 2023
Merged

[Renewed] Refactor preprocessor architecture to enhance extensibility #694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3844e91
add airflow variants to transformation types
Forthoney Oct 26, 2023
d26df3c
move transformation state classes to separate module
Forthoney Oct 26, 2023
029c335
refactor to accomodate new organization
Forthoney Oct 26, 2023
3d5fc1e
run formatter + add signatures
Forthoney Oct 26, 2023
4436c96
change starting comment into module doctring
Forthoney Oct 26, 2023
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
19 changes: 10 additions & 9 deletions compiler/preprocessor/preprocessor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import os

import config
from shell_ast import ast_to_ast
from shell_ast import transformation_options, ast_to_ast
from ir import FileIdGen
from parse import parse_shell_to_asts, from_ast_objects_to_shell
from util import *
Expand All @@ -30,20 +30,21 @@ def preprocess(input_script_path, args):
## 3. Translate the new AST back to shell syntax
preprocessing_unparsing_start_time = datetime.now()
preprocessed_shell_script = from_ast_objects_to_shell(preprocessed_asts)

preprocessing_unparsing_end_time = datetime.now()
print_time_delta("Preprocessing -- Unparsing", preprocessing_unparsing_start_time, preprocessing_unparsing_end_time)
return preprocessed_shell_script


def preprocess_asts(ast_objects, args):
trans_mode = ast_to_ast.TransformationType(args.preprocess_mode)
if trans_mode is ast_to_ast.TransformationType.SPECULATIVE:
trans_options = ast_to_ast.SpeculativeTransformationState(mode=trans_mode,
po_file=args.partial_order_file)
trans_mode = transformation_options.TransformationType(args.preprocess_mode)
if trans_mode is transformation_options.TransformationType.SPECULATIVE:
trans_options = transformation_options.SpeculativeTransformationState(po_file=args.partial_order_file)
util_spec.initialize(trans_options)
elif trans_mode is transformation_options.TransformationType.AIRFLOW:
trans_options = transformation_options.AirflowTransformationState()
else:
trans_options = ast_to_ast.TransformationState(mode=trans_mode)
trans_options = transformation_options.TransformationState()

## Preprocess ASTs by replacing AST regions with calls to PaSh's runtime.
## Then the runtime will do the compilation and optimization with additional
Expand All @@ -52,7 +53,7 @@ def preprocess_asts(ast_objects, args):

## Let the scheduler know that we are done with the partial_order file
## TODO: We could stream the partial_order_file to the scheduler
if trans_mode is ast_to_ast.TransformationType.SPECULATIVE:
if trans_mode is transformation_options.TransformationType.SPECULATIVE:
## First complete the partial_order file
util_spec.serialize_partial_order(trans_options)

Expand Down Expand Up @@ -85,7 +86,7 @@ def main():
## TODO: When we better integrate, this should be automatically set.
parser_spec.add_argument("partial_order_file", help="the file to store the partial order (currently just a sequence)")
parser_spec.set_defaults(preprocess_mode='spec')

args = parser.parse_args()
config.set_config_globals_from_pash_args(args)

Expand Down
Loading
Loading