This repository has been archived by the owner on Nov 17, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 6.8k
Fixes installation nightly test #14144
Merged
Merged
Changes from all commits
Commits
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 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 |
---|---|---|
|
@@ -250,6 +250,29 @@ function set_instruction_set() { | |
${sorted_indexes[$end_buildfromsource_command_index]}) | ||
} | ||
|
||
# given a $buildfromsource_commands string, filter out any build commands that should not be executed | ||
# during the build from source tests. An example, the build from source instructions include the commands: | ||
# $ git clone --recursive /~https://github.com/apache/incubator-mxnet | ||
# $ cd incubator-mxnet | ||
# if these commands get executed in the jenkins job, we will be testing the build from source instructions | ||
# against the master branch and not against the version of the repository that Jenkins checksout for testing. | ||
# This presents a particularly big problem for the version branches and their nightly builds. Because, | ||
# we would, in effect, be testing the build from source instructions for one version of MXNet against | ||
# the master branch. | ||
# in this function we target the commands cited in the example above, but leave it open for expantion | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nitpick: "In" "explanation" |
||
# in the future. | ||
# See also gh issue: /~https://github.com/apache/incubator-mxnet/issues/13800 | ||
function filter_build_commands() { | ||
filtered_build_commands="${1}" | ||
|
||
# Remove git commands | ||
filtered_build_commands=`echo "${filtered_build_commands}" | perl -pe 's/git .*?;//g'` | ||
|
||
# Remove 'cd incubator-mxnet' | ||
filtered_build_commands=`echo "${filtered_build_commands}" | perl -pe 's/cd incubator-mxnet;//'` | ||
|
||
echo "${filtered_build_commands}" | ||
} | ||
|
||
########################LINUX-PYTHON-CPU############################ | ||
echo | ||
|
@@ -302,8 +325,8 @@ ubuntu_python_cpu_source() | |
set -e | ||
echo | ||
echo "### Testing Build From Source ###" | ||
echo "${buildfromsource_commands}" | ||
echo | ||
buildfromsource_commands=$(filter_build_commands "${buildfromsource_commands}") | ||
echo ${buildfromsource_commands} | ||
eval ${buildfromsource_commands} | ||
echo "ubuntu_python_cpu_source: MXNet Installed Successfully" | ||
|
||
|
@@ -363,8 +386,8 @@ ubuntu_python_gpu_source() | |
set -e | ||
echo | ||
echo "### Testing Build From Source ###" | ||
echo "${buildfromsource_commands}" | ||
echo | ||
buildfromsource_commands=$(filter_build_commands "${buildfromsource_commands}") | ||
echo ${buildfromsource_commands} | ||
eval ${buildfromsource_commands} | ||
echo "ubuntu_python_gpu_source: MXNet Installed Successfully" | ||
|
||
|
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.
nitpick: checks out