Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

[MXNET-711] Website build and version dropdown update #11892

Merged
merged 6 commits into from
Jul 29, 2018

Conversation

aaronmarkham
Copy link
Contributor

@aaronmarkham aaronmarkham commented Jul 25, 2018

Description

The website was displaying the versions based on the build of the branch names and not any minor version updates. For example, even though we're on v1.2.1 code, we're displaying v1.2.0 in the dropdown.

2018-07-25_15-11-11

I implemented new Jenkins and website build logic that allows you to control the display from Jenkins. You can now map code from a branch or a tag to whatever display name you want. Here I've updated 1.2.0 to say 1.2.1.

2018-07-25_15-10-41

A preview is here: http://34.201.8.176/versions/1.2.1/index.html
A smaller, limited versions test Jenkins run is here: http://jenkins.mxnet-ci.amazon-ml.com/job/test-website-build/5/console
After I run a complete, all versions test run this PR should be ready to roll.

Checklist

Essentials

  • The PR title starts with [MXNET-$JIRA_ID], where $JIRA_ID refers to the relevant JIRA issue created (except PRs with tiny changes)
  • Code is well-documented:
  • Code changes are complete - several Jenkins-related updates are needed once this PR is about to be merged:
    • docs/Jenkinsfile: I removed "reserved-$node", so I could test. "reserved" needs to be added back before merge. UPDATE: added this back and see post-merge notes below

2018-07-25_15-40-35

Changes

  1. CI will call an updated Jenkinsfile in /docs that will run the test jobs on unrestricted nodes. (This file should be reverted once the PR is approved.)
  2. CI's runtime_functions will now send the tag_list param (what to display) to the build script (build_all_version.sh) that builds each branch as a new version of the site.
  3. build_all_version.sh will build each version and put the artifacts into the folders that were defined in the new display param.
  4. update_all_version.sh picks up like before and injects the versions dropdown, but now will have new versions display (1.2.1 instead of 1.2.0).

Important for Post-Merge

  • Jenkins job - restricted-website-build - this production job should be updated to use the new tag capability where you can choose tags or branches for tags to build. This requires the "v" to be appended to each. Then for the tag_list param, you use the display you want. So for branchv1.2.0 you use 1.2.1 and for v0.12.0 you use 0.12.1. Just copy the tags_list and tags_to_build settings in the test-website-build pipeline.

@aaronmarkham aaronmarkham requested a review from szha as a code owner July 25, 2018 22:49
@aaronmarkham
Copy link
Contributor Author

aaronmarkham commented Jul 26, 2018

My full test completed and generated artifacts for all of the current versions: 1.2.1-->0.11.0.
http://34.201.8.176/versions/1.2.1/index.html
The publish test job isn't getting triggered for some reason. Maybe it must be on a restricted node?

Anyways, I'm not seeing any problems with this PR. I'm pretty much finished testing. I restarted CI. It failed on a flaky test, so assuming it goes through this time, let's merge!

I'm going to revert the Jenkinsfile. Then it'll go through CI again.

@aaronmarkham
Copy link
Contributor Author

This is good to go. Please see the post merge info the the PR's main comment.

@szha szha merged commit ab5242c into apache:master Jul 29, 2018
aaronmarkham added a commit to aaronmarkham/incubator-mxnet that referenced this pull request Aug 7, 2018
* adding param for list of tags to display on website

* using new website display argument for artifact placement in version folder

* adding display logic

* remove restricted setting for testing

* update usage instructions

* reverted Jenkinsfile to use restricted nodes

[MXAPPS-581] Fixes for broken Straight Dope tests. (apache#11923)

* Update relative paths pointing to the data directory to point to the
  correct place in the testing temporary folder.

* Enable the notebooks that were previously broken because of relative
  file paths not pointing to the correct place.

* Move some notebooks we do not plan to test to the whitelist. These
  notebooks are not published in the Straight Dope book.

* Clean-up: Convert print statements to info/warn/error logging
  statements. Add some logging statements for better status.

Disable flaky test: test_spatial_transformer_with_type (apache#11930)

apache#11839

Add linux and macos MKLDNN Building Instruction (apache#11049)

* add linux and macos doc

* update doc

* Update MKL_README.md

* Update MKL_README.md

Add convolution code to verify mkldnn backend

* add homebrew link

* rename to MKLDNN_README

* add mkl verify

* trigger

* trigger

* set mac complier to gcc47

* add VS2017 support experimentally

* improve quality

* improve quality

* modify mac build instruction since prepare_mkldnn.sh has been rm

* trigger

* add some improvement

[MXNET-531] Add download util (apache#11866)

* add changes to example

* place the file to the util

* add retry scheme

* fix the retry logic

* change the DownloadUtil to Util

* Trigger the CI

[MXNET-11241] Avoid use of troublesome cudnnFind() results when grad_req='add' (apache#11338)

* Add tests that fail due to issue 11241

* Fix apache#11241 Conv1D throws CUDNN_STATUS_EXECUTION_FAILED

* Force algo 1 when grad_req==add with large c.  Expand tests.

* Shorten test runtimes.

Improving documentation and error messages for Async distributed training with Gluon (apache#11910)

* Add description about update on kvstore

* add async check for gluon

* only raise error if user set update_on_kvstore

* fix condition

* add async nightly test

* fix case when no kvstore

* add example for trainer creation in doc

[MXNET-641] fix R windows install docs (apache#11805)

* fix R windows install docs

* addressed PR comments

* PR comments

* PR comments

* fixed line wrappings

* fixed line wrappings

a hot fix for mkldnn link (apache#11939)

re-enabling randomized test_l2_normalization (apache#11900)

[MXNET-651] MXNet Model Backwards Compatibility Checker (apache#11626)

* Added MNIST-MLP-Module-API models to check model save and load_checkpoint methods

* Added LENET with Conv2D operator training file

* Added LENET with Conv2d operator inference file

* Added LanguageModelling with RNN training file

* Added LamguageModelling with RNN inference file

* Added hybridized LENET Gluon Model training file

* Added hybridized LENET gluon model inference file

* Added license headers

* Refactored the model and inference files and extracted out duplicate code in a common file

* Added runtime function for executing the MBCC files

* Added JenkinsFile for MBCC to be run as a nightly job

* Added boto3 install for s3 uploads

* Added README for MBCC

* Added license header

* Added more common functions from lm_rnn_gluon_train and inference files into common.py to clean up code

* Added scripts for training models on older versions of MXNet

* Added check for preventing inference script from crashing in case no trained models are found

* Fixed indentation issue

* Replaced Penn Tree Bank Dataset with Sherlock Holmes Dataset

* Fixed indentation issue

* Removed training in models and added smaller models. Now we are simply checking a forward pass in the model with dummy data.

* Updated README

* Fixed indentation error

* Fixed indentation error

* Removed code duplication in the training file

* Added comments for runtime_functions script for training files

* Merged S3 Buckets for storing data and models into one

* Automated the process to fetch MXNet versions from git tags

* Added defensive checks for the case where the data might not be found

* Fixed issue where we were performing inference on state model files

* Replaced print statements with logging ones

* Removed boto install statements and move them into ubuntu_python docker

* Separated training and uploading of models into separate files so that training runs in Docker and upload runs outside Docker

* Fixed pylint warnings

* Updated comments and README

* Removed the venv for training process

* Fixed indentation in the MBCC Jenkins file and also separated out training and inference into two separate stages

* Fixed indendation

* Fixed erroneous single quote

* Added --user flag to check for Jenkins error

* Removed unused methods

* Added force flag in the pip command to install mxnet

* Removed the force-re-install flag

* Changed exit 1 to exit 0

* Added quotes around the shell command

* added packlibs and unpack libs for MXNet builds

* Changed PythonPath from relative to absolute

* Created dedicated bucket with correct permission

* Fix for python path in training

* Changed bucket name to CI bucket

* Added set -ex to the upload shell script

* Now raising an exception if no models are found in the S3 bucket

* Added regex to train models script

* Added check for performing inference only on models trained on same major versions

* Added set -ex flags to shell scripts

* Added multi-version regex checks in training

* Fixed typo in regex

* Now we will train models for all the minor versions for a given major version by traversing the tags

* Added check for validating current_version

[MXNET-531] NeuralStyle Example for Scala (apache#11621)

* add initial neuralstyle and test coverage

* Add two more test and README

* kill comments

* patch on memory leaks fix

* fix formatting issues

* remove redundant files

* disable the Gan example for now

* add ignore method

* add new download scheme to match the changes
XinYao1994 pushed a commit to XinYao1994/incubator-mxnet that referenced this pull request Aug 29, 2018
* adding param for list of tags to display on website

* using new website display argument for artifact placement in version folder

* adding display logic

* remove restricted setting for testing

* update usage instructions

* reverted Jenkinsfile to use restricted nodes
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants