This repository was archived by the owner on Aug 26, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 90
Generic MPI - Create library to changehostname when mpi starts #153
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| [flake8] | ||
| application_import_names = sagemaker_containers, test | ||
| import-order-style = google | ||
| application_import_names = sagemaker_containers, test, libchangehostname | ||
| import-order-style = google |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| // Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the 'License'). You | ||
| // may not use this file except in compliance with the License. A copy of | ||
| // the License is located at | ||
| // | ||
| // http://aws.amazon.com/apache2.0/ | ||
| // | ||
| // or in the 'license' file accompanying this file. This file is | ||
| // distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF | ||
| // ANY KIND, either express or implied. See the License for the specific | ||
| // language governing permissions and limitations under the License. | ||
|
|
||
| #include <Python.h> | ||
| #include <stdlib.h> | ||
|
|
||
|
|
||
| int libchangehostname(char *name, size_t len) | ||
| { | ||
| const char *val = getenv("SM_CURRENT_HOST"); | ||
|
|
||
| strncpy(name, val, len); | ||
| return 0; | ||
| } | ||
|
|
||
|
|
||
| static PyObject* libchangehostname_call(PyObject* self, PyObject* args) { | ||
| long unsigned command; | ||
| char name[40]; | ||
|
|
||
| if (!PyArg_ParseTuple(args, "k", &command)) { | ||
| return NULL; | ||
| } | ||
|
|
||
| libchangehostname(name, command); | ||
|
|
||
| return Py_BuildValue("s", name); | ||
| } | ||
|
|
||
| static PyMethodDef LibchangehostnameMethods[] = { | ||
| { | ||
| "call", | ||
| libchangehostname_call, | ||
| METH_VARARGS, | ||
| }, | ||
| {NULL, NULL, 0, NULL}, // sentinel | ||
| }; | ||
|
|
||
| #if PY_MAJOR_VERSION >= 3 | ||
| static PyModuleDef libchangehostnamemodule = { | ||
| PyModuleDef_HEAD_INIT, | ||
| "libchangehostname", | ||
| "Returns the value of $SM_CURRENT_HOST", | ||
| -1, | ||
| LibchangehostnameMethods, | ||
| }; | ||
|
|
||
| PyMODINIT_FUNC PyInit_libchangehostname() { | ||
| return PyModule_Create(&libchangehostnamemodule); | ||
| } | ||
| #else | ||
| PyMODINIT_FUNC initlibchangehostname() { | ||
| PyObject* module; | ||
|
|
||
| module = Py_InitModule3( | ||
| "libchangehostname", LibchangehostnameMethods, "Returns the value of $SM_CURRENT_HOST"); | ||
| } | ||
| #endif | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| # Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the 'License'). You | ||
| # may not use this file except in compliance with the License. A copy of | ||
| # the License is located at | ||
| # | ||
| # http://aws.amazon.com/apache2.0/ | ||
| # | ||
| # or in the 'license' file accompanying this file. This file is | ||
| # distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF | ||
| # ANY KIND, either express or implied. See the License for the specific | ||
| # language governing permissions and limitations under the License. | ||
| import os | ||
| import sys | ||
|
|
||
| from mock import patch | ||
| import pytest | ||
|
|
||
| import libchangehostname | ||
| from sagemaker_containers import _errors, _process | ||
|
|
||
|
|
||
| def test_libchangehostname_with_env_set_in_another_process(): | ||
| with patch.dict(os.environ, {'SM_CURRENT_HOST': 'algo-5'}): | ||
| py_cmd = "import libchangehostname\nassert libchangehostname.call(30) == 'algo-5'" | ||
| _process.check_error([sys.executable, '-c', py_cmd], _errors.ExecuteUserScriptError) | ||
|
|
||
|
|
||
| def test_libchangehostname_with_env_set(): | ||
| with patch.dict(os.environ, {'SM_CURRENT_HOST': 'algo-3'}): | ||
| assert libchangehostname.call(30) == 'algo-3' | ||
|
|
||
|
|
||
| def test_libchangehostname_with_env_not_set(): | ||
| py_cmd = "import libchangehostname\nassert libchangehostname.call(30) == 'algo-9'" | ||
|
|
||
| with pytest.raises(_errors.ExecuteUserScriptError): | ||
| _process.check_error([sys.executable, '-c', py_cmd], _errors.ExecuteUserScriptError) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i don't really like that it depends on an environment variable that might now be initialized yet.
I understand that right now we call it at 'the right' time, but since it's not really guaranteed by anyone I am worried that it might cause issues in the future.
Also sagemaker-containers is not just a library used by us, we also advertise and help customers to use it in BYOC use case.
Anyway we can switch to use json file or guarantee that it's called only after this environment variable is initialized?