Skip to content

Commit

Permalink
Update R light test to use jinja2 command line arg passing to test th…
Browse files Browse the repository at this point in the history 
…at new functionality.
  • Loading branch information
@madeline-scyphers
madeline-scyphers committed Oct 31, 2023
1 parent 8e672dd commit b55f296
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion environment_dev.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ channels:
- conda-forge
- domdfcoding
dependencies:
- python=3.10
- python=3.11
# mac x86 or apple silicone macs on rosetta python need pytorch>2
# so if on either of those, it should install pytorch>2 by default
# but if not and something doesn't work, upgrade pytorch, torchvision,
Expand Down
2 changes: 1 addition & 1 deletion tests/scripts/other_langs/r_package_light/config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ parameters:
'value_type': 'float'

script_options:
run_model: Rscript run_model.R
run_model: Rscript run_model.R {{ x0 }} {{ x1 }}

model_options:
input_size: 15
Expand Down
7 changes: 5 additions & 2 deletions tests/scripts/other_langs/r_package_light/run_model.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,11 @@ trial_dir <- args[length(args)]
param_path <- file.path(trial_dir, "parameters.json")
data <- read_json(path=param_path)

x0 <- data$x0
x1 <- data$x1
# We pull these from command line arguments defined from jinja2 template in the config
# to test that we can for testing
x0 <- as.numeric(args[1])
x1 <- as.numeric(args[2])

x2 <- data$x2
x3 <- data$x3
x4 <- data$x4
Expand Down

4 comments on commit b55f296

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Coverage

Coverage Report
FileStmtsMissCoverMissing
__main__.py90594%83, 135, 166, 211, 219
async_opt.py1061883%137, 182, 189, 194, 212–213, 219–220, 222–223, 225, 232–237, 241
ax_instantiation_utils.py47197%123
controller.py74395%73, 84, 170
definitions.py80100% 
instantiation_base.py40197%39
metaclasses.py72395%50–51, 57
plot.py12120%15, 17–18, 20–21, 24, 27, 34, 40–41, 44–45
plotting.py1412880%51–52, 59, 94–95, 251–253, 301–305, 345, 429–432, 434–441, 443, 448
registry.py80100% 
runner.py51492%52, 86–88
scheduler.py811482%38, 128–131, 138–139, 153, 160–161, 168–169, 264–265
storage.py1241587%83, 115–117, 177, 195, 273–281
template.py31583%52–56
utils.py992079%179, 193–194, 219, 229–233, 235–237, 239, 241, 245–250
config
   __main__.py00100% 
   config.py3073488%33, 211, 217, 221, 223–224, 226, 282, 409, 412, 420–421, 429, 603, 605, 607, 613–617, 619, 690, 723, 744, 751–752, 760, 773, 783–784, 796, 821, 824
   converters.py751382%14, 22, 41, 46–48, 51–52, 65, 67, 71, 79, 95
metrics
   metric_funcs.py34488%58, 80–81, 83
   metrics.py1011585%127, 304–305, 310–311, 314, 320, 331–333, 337–341
   modular_metric.py1252282%39–42, 44–51, 65, 132, 143, 177–178, 189, 240–241, 260–261
   synthetic_funcs.py39489%31, 35, 58, 65
scripts
   moo.py30196%44
   run_branin.py34197%56
   script_wrappers.py31293%57–58
   synth_func_cli.py210100% 
wrappers
   base_wrapper.py1953084%63–64, 89–92, 94, 102, 110, 115, 147, 156, 167, 215–216, 218, 267, 269, 271, 275, 330, 402, 416, 589, 591–594, 602, 612
   script_wrapper.py1181190%196, 207–208, 276, 279–281, 285, 326, 344, 349
   synthetic_wrapper.py16287%16, 28
   wrapper_utils.py150994%148–149, 247, 299, 423–425, 433–434
TOTAL226027787% 

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Coverage

Coverage Report
FileStmtsMissCoverMissing
__main__.py90594%83, 135, 166, 211, 219
async_opt.py1061883%137, 182, 189, 194, 212–213, 219–220, 222–223, 225, 232–237, 241
ax_instantiation_utils.py47197%123
controller.py74395%73, 84, 170
definitions.py80100% 
instantiation_base.py40197%39
metaclasses.py72395%50–51, 57
plot.py12120%15, 17–18, 20–21, 24, 27, 34, 40–41, 44–45
plotting.py1412880%51–52, 59, 94–95, 251–253, 301–305, 345, 429–432, 434–441, 443, 448
registry.py80100% 
runner.py51492%52, 86–88
scheduler.py811482%38, 128–131, 138–139, 153, 160–161, 168–169, 264–265
storage.py1241587%83, 115–117, 177, 195, 273–281
template.py31583%52–56
utils.py992079%179, 193–194, 219, 229–233, 235–237, 239, 241, 245–250
config
   __main__.py00100% 
   config.py3073488%33, 211, 217, 221, 223–224, 226, 282, 409, 412, 420–421, 429, 603, 605, 607, 613–617, 619, 690, 723, 744, 751–752, 760, 773, 783–784, 796, 821, 824
   converters.py751382%14, 22, 41, 46–48, 51–52, 65, 67, 71, 79, 95
metrics
   metric_funcs.py34488%58, 80–81, 83
   metrics.py1011585%127, 304–305, 310–311, 314, 320, 331–333, 337–341
   modular_metric.py1252282%39–42, 44–51, 65, 132, 143, 177–178, 189, 240–241, 260–261
   synthetic_funcs.py39489%31, 35, 58, 65
scripts
   moo.py30196%44
   run_branin.py34197%56
   script_wrappers.py31293%57–58
   synth_func_cli.py210100% 
wrappers
   base_wrapper.py1953084%63–64, 89–92, 94, 102, 110, 115, 147, 156, 167, 215–216, 218, 267, 269, 271, 275, 330, 402, 416, 589, 591–594, 602, 612
   script_wrapper.py1181190%196, 207–208, 276, 279–281, 285, 326, 344, 349
   synthetic_wrapper.py16287%16, 28
   wrapper_utils.py150994%148–149, 247, 299, 423–425, 433–434
TOTAL226027787% 

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Coverage

Coverage Report
FileStmtsMissCoverMissing
__main__.py90594%83, 135, 166, 211, 219
async_opt.py1061883%137, 182, 189, 192, 212–213, 219–220, 222–223, 225, 232–237, 241
ax_instantiation_utils.py47197%123
controller.py74395%73, 84, 170
definitions.py80100% 
instantiation_base.py40197%39
metaclasses.py72395%50–51, 57
plot.py12120%15, 17–18, 20–21, 24, 27, 34, 40–41, 44–45
plotting.py1412880%51–52, 59, 94–95, 251–253, 301–305, 345, 429–432, 434–441, 443, 448
registry.py80100% 
runner.py51492%52, 86–88
scheduler.py811482%38, 128–131, 138–139, 153, 160–161, 168–169, 264–265
storage.py1241587%83, 115–117, 177, 195, 273–281
template.py31583%52–56
utils.py992079%179, 193–194, 219, 229–233, 235–237, 239, 241, 245–250
config
   __main__.py00100% 
   config.py3073488%33, 211, 217, 221, 223–224, 226, 282, 409, 412, 420–421, 429, 603, 605, 607, 613–617, 619, 690, 723, 744, 751–752, 760, 773, 783–784, 796, 821, 824
   converters.py751382%14, 22, 41, 46–48, 51–52, 65, 67, 71, 79, 95
metrics
   metric_funcs.py34488%58, 80–81, 83
   metrics.py1011585%127, 304–305, 310–311, 314, 320, 331–333, 337–341
   modular_metric.py1252282%39–42, 44–51, 65, 132, 143, 177–178, 189, 240–241, 260–261
   synthetic_funcs.py39489%31, 35, 58, 65
scripts
   moo.py30196%44
   run_branin.py34197%56
   script_wrappers.py31293%57–58
   synth_func_cli.py210100% 
wrappers
   base_wrapper.py1953084%63–64, 89–92, 94, 102, 110, 115, 147, 156, 167, 215–216, 218, 267, 269, 271, 275, 330, 402, 416, 589, 591–594, 602, 612
   script_wrapper.py1181190%196, 207–208, 276, 279–281, 285, 326, 344, 349
   synthetic_wrapper.py16287%16, 28
   wrapper_utils.py150994%148–149, 247, 299, 423–425, 433–434
TOTAL226027787% 

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Coverage

Coverage Report
FileStmtsMissCoverMissing
__main__.py90594%83, 135, 166, 211, 219
async_opt.py1061883%137, 182, 189, 192, 212–213, 219–220, 222–223, 225, 232–237, 241
ax_instantiation_utils.py47197%123
controller.py74395%73, 84, 170
definitions.py80100% 
instantiation_base.py40197%39
metaclasses.py72395%50–51, 57
plot.py12120%15, 17–18, 20–21, 24, 27, 34, 40–41, 44–45
plotting.py1412880%51–52, 59, 94–95, 251–253, 301–305, 345, 429–432, 434–441, 443, 448
registry.py80100% 
runner.py51492%52, 86–88
scheduler.py811482%38, 128–131, 138–139, 153, 160–161, 168–169, 264–265
storage.py1241587%83, 115–117, 177, 195, 273–281
template.py31583%52–56
utils.py992079%179, 193–194, 219, 229–233, 235–237, 239, 241, 245–250
config
   __main__.py00100% 
   config.py3073488%33, 211, 217, 221, 223–224, 226, 282, 409, 412, 420–421, 429, 603, 605, 607, 613–617, 619, 690, 723, 744, 751–752, 760, 773, 783–784, 796, 821, 824
   converters.py751382%14, 22, 41, 46–48, 51–52, 65, 67, 71, 79, 95
metrics
   metric_funcs.py34488%58, 80–81, 83
   metrics.py1011585%127, 304–305, 310–311, 314, 320, 331–333, 337–341
   modular_metric.py1252282%39–42, 44–51, 65, 132, 143, 177–178, 189, 240–241, 260–261
   synthetic_funcs.py39489%31, 35, 58, 65
scripts
   moo.py30196%44
   run_branin.py34197%56
   script_wrappers.py31293%57–58
   synth_func_cli.py210100% 
wrappers
   base_wrapper.py1953084%63–64, 89–92, 94, 102, 110, 115, 147, 156, 167, 215–216, 218, 267, 269, 271, 275, 330, 402, 416, 589, 591–594, 602, 612
   script_wrapper.py1181190%196, 207–208, 276, 279–281, 285, 326, 344, 349
   synthetic_wrapper.py16287%16, 28
   wrapper_utils.py150994%148–149, 247, 299, 423–425, 433–434
TOTAL226027787% 

Please sign in to comment.