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

Update mlnet #522

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
+18 −13
Open

Update mlnet #522

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
feb4273
Update setup.sh
LittleLittleCloud Apr 15, 2023
5f78d10
Update exec.py
LittleLittleCloud Apr 15, 2023
1bd259b
Update exec.py
LittleLittleCloud Apr 15, 2023
a76acef
Update exec.py
LittleLittleCloud Apr 15, 2023
61392e1
Update exec.py
LittleLittleCloud Apr 15, 2023
f9973be
Merge branch 'master' into patch-3
LittleLittleCloud Aug 20, 2023
3c645b2
Update exec.py
LittleLittleCloud Aug 20, 2023
5c640b3
Update exec.py
LittleLittleCloud Aug 20, 2023
92d4fdf
Update exec.py
LittleLittleCloud Aug 20, 2023
23ef582
update
Aug 20, 2023
69cbdaf
rm tmp folder
Aug 20, 2023
8bacdbb
Update exec.py
LittleLittleCloud Aug 20, 2023
efbbc50
update
Aug 20, 2023
25c7a0b
Merge branch 'patch-3' of https://github.com/LittleLittleCloud/automl…
Aug 20, 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
20 changes: 11 additions & 9 deletions frameworks/MLNet/exec.py
View file
Original file line number Diff line number Diff line change
@@ -35,9 +35,6 @@ def run(dataset: Dataset, config: TaskConfig):
train_time_in_seconds = config.max_runtime_seconds
sub_command = config.type

# set up MODELBUILDER_AUTOML
MODELBUILDER_AUTOML = config.framework_params.get('automl_type', 'NNI')
os.environ['MODELBUILDER_AUTOML'] = MODELBUILDER_AUTOML

artifacts = config.framework_params.get('_save_artifacts', [])
tmpdir = tempfile.mkdtemp()
@@ -50,18 +47,23 @@ def run(dataset: Dataset, config: TaskConfig):
label = dataset.target.index
train_dataset_path = dataset.train.data_path('csv')
test_dataset_path = dataset.test.data_path('csv')

log.info(f'train dataset: {train_dataset_path}')
log.info(f'test dataset: {test_dataset_path}')
log.info(f'train dataset: {train_dataset_path}')

cmd = (f"{mlnet} {sub_command}"
f" --dataset {train_dataset_path} --test-dataset {test_dataset_path} --train-time {train_time_in_seconds}"
f" --dataset {train_dataset_path} --train-time {train_time_in_seconds}"
f" --label-col {label} --output {os.path.dirname(output_dir)} --name {config.fold}"
f" --verbosity q --log-file-path {log_path}")

with Timer() as training:
run_cmd(cmd)
log.info(f"Finished fit in {training.duration}s.")
try:
run_cmd(cmd , _live_output_=True)
log.info(f"Finished fit in {training.duration}s.")
except:
log.info(f"error: please visit {log_path} for more information")
with open(log_path, 'r') as f:
for line in f:
log.info(line)

train_result_json = os.path.join(output_dir, '{}.mbconfig'.format(config.fold))
if not os.path.exists(train_result_json):
@@ -70,7 +72,7 @@ def run(dataset: Dataset, config: TaskConfig):
with open(train_result_json, 'r') as f:
json_str = f.read()
mb_config = json.loads(json_str)
model_path = os.path.join(output_dir, f"{config.fold}.zip")
model_path = os.path.join(output_dir, f"{config.fold}.mlnet")
output_prediction_path = os.path.join(log_dir, "prediction.txt") # keeping this in log dir as it contains useful error when prediction fails
models_count = len(mb_config['RunHistory']['Trials'])
# predict
11 changes: 7 additions & 4 deletions frameworks/MLNet/setup.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
HERE=$(dirname "$0")
MLNET='mlnet'
MLNET_PACKAGE='mlnet-linux-x64'
Copy link
Collaborator

Choose a reason for hiding this comment

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

Would it be possible to adjust this so it also works on ARM (and preferably also macos)? For example by storing the result of:

import sys
import platform
platform = {"linux": "linux", "darwin": "osx"}.get(sys.platform)
machine =  {"arm64": "arm64", "x86_64": "x64"}.get(platform.machine())
print(f"mlnet-{platform}-{machine}")

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yep that would work. You might need to target to different platform for arm64 and x64 though

available packages

  • mlnet-linux-x64
  • mlnet-linux-arm64
  • mlnet-macos-x64
  • mlnet-macos-arm64 (for m-seriese chip)

Copy link
Collaborator

@PGijsbers PGijsbers Aug 26, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

That should be in the above script already :) and based on the installation docs the mac abbreviation is osx instead of macos.

VERSION=${1:-"latest"}

DOTNET_INSTALL_DIR="$HERE/lib"
@@ -21,13 +21,16 @@ if [[ ! -x "$MLNET" ]]; then
if [[ ! -x "$DOTNET" ]]; then
wget -P "$DOTNET_INSTALL_DIR" https://dot.net/v1/dotnet-install.sh
chmod +x "$DOTNET_INSTALL_DIR/dotnet-install.sh"
"$DOTNET_INSTALL_DIR/dotnet-install.sh" -c Current --install-dir "$DOTNET_INSTALL_DIR" -Channel 3.1 --verbose
"$DOTNET_INSTALL_DIR/dotnet-install.sh" -c Current --install-dir "$DOTNET_INSTALL_DIR" -Channel 6.0 --verbose
fi
$DOTNET tool install mlnet --add-source "$SOURCE" --version "$VERSION" --tool-path "$DOTNET_INSTALL_DIR"
$DOTNET tool install $MLNET_PACKAGE --add-source "$SOURCE" --version "$VERSION" --tool-path "$DOTNET_INSTALL_DIR"
else
$DOTNET tool update mlnet --add-source "$SOURCE" --version "$VERSION" --tool-path "$DOTNET_INSTALL_DIR"
$DOTNET tool update $MLNET_PACKAGE --add-source "$SOURCE" --version "$VERSION" --tool-path "$DOTNET_INSTALL_DIR"
fi

export DOTNET_ROOT="$DOTNET_INSTALL_DIR"

# enable predict command in mlnet
export MLNetCLIEnablePredict=True

$MLNET --version | grep + | sed -e "s/\(.?*\)+.*/\1/" >> "${HERE}/.setup/installed"