Updates for SystemML as TLP Closes #53, Closes #52, Closes #51, Closes #50.
Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml-website/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml-website/commit/2137dcfd Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml-website/tree/2137dcfd Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml-website/diff/2137dcfd Branch: refs/heads/master Commit: 2137dcfd320076c41ce610930ae5a1e5d48d5cb8 Parents: 37b9d3f Author: Jeremy Anderson <[email protected]> Authored: Fri May 19 14:38:41 2017 -0700 Committer: Deron Eriksson <[email protected]> Committed: Fri May 19 14:38:41 2017 -0700 ---------------------------------------------------------------------- _src/_includes/themes/apache/home.html | 19 +- _src/_sass/_base.scss | 9 + _src/_sass/_config.scss | 2 +- _src/_sass/_icons.scss | 30 +- _src/_sass/_layout.scss | 19 ++ _src/_sass/_modules.scss | 49 ++++ _src/_scripts/main.js | 11 + _src/assets/img/jupyter-logo.svg | 1 + _src/assets/img/systemml-juypter-install-2.jpeg | Bin 0 -> 394780 bytes _src/assets/img/systemml-juypter-install.jpeg | Bin 0 -> 80437 bytes _src/assets/js/bundle.min.js | 8 +- _src/get-started.html | 273 +++---------------- _src/install-systemml.html | 169 ++++++++++++ 13 files changed, 325 insertions(+), 265 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-systemml-website/blob/2137dcfd/_src/_includes/themes/apache/home.html ---------------------------------------------------------------------- diff --git a/_src/_includes/themes/apache/home.html b/_src/_includes/themes/apache/home.html index 9567f77..3c177ac 100644 --- a/_src/_includes/themes/apache/home.html +++ b/_src/_includes/themes/apache/home.html @@ -50,7 +50,7 @@ limitations under the License. <!-- About --> <section class="full-stripe"> <div class="ml-container ml-container--vertically-top ml-container--reverse-order"> - <div class="col col-6 content-group content-group--more-padding"> + <div class="col col-6 content-group"> <!--<img src="/assets/img/diagramAnim-v4.gif" alt="What is Apache SystemML?">--> <div class="video-wrapper"> <iframe src="https://www.youtube.com/embed/r-kFYkYoD_4"; frameborder="0" allowfullscreen></iframe> @@ -59,14 +59,12 @@ limitations under the License. <div class="col col-6 content-group content-group--more-padding"> <!-- bdi tag prevents reverse punctuation when rtl direction property is applied --> <h2><bdi>What is SystemML?</bdi></h2> - <p><bdi>Apache SystemML provides declarative, large-scalable machine learning and deep learning. Data scientists are able to implement algorithms and neural network architectures in a high-level language without knowledge of distributed programming or Apache Spark. Depending on data characteristics such as data size/shape and data sparsity (dense/sparse), and cluster characteristics such as cluster size and memory configurations, SystemML's cost-based optimizing compiler automatically generates hybrid runtime execution plans that are composed of single-node and distributed operations on a Apache Spark cluster for best performance.</bdi></p> - - <p><bdi>Very soon, additional deep learning capabilities will allow for importing and running popular neural network architectures and pre-trained models from Caffe for training and scoring in SystemML.</bdi></p> + <p>Apache SystemML provides an optimal workplace for machine learning using big data. It can be run on top of Apache Spark, where it automatically scales your data, line by line, determining whether your code should be run on the driver or an Apache Spark cluster. Future SystemML developments include additional deep learning with GPU capabilities such as importing and running neural network architectures and pre-trained models for training.</p> </div> </div> </section> -<!-- Beginner Tutorial --> +<!-- BGet Started --> <section class="full-stripe full-stripe--alternate"> <div class="ml-container ml-container--vertically-centered"> <div class="col col-6 content-group content-group--more-padding"> @@ -75,24 +73,27 @@ limitations under the License. <div class="col col-6 content-group content-group--more-padding button-group"> <h2>Get Started</h2> <p>New to Apache SystemML? Try our Get Started tutorial that will walk you through setting up your environment and getting you up and going with SystemML.</p> - <a class="button button-primary" href="get-started.html">Begin Tutorial</a> + <a class="button button-primary" href="install-systemml.html">Install SystemML</a> <a class="button button-secondary" href="documentation.html" target="_blank">Docs</a> </div> </div> + + <h4 class="text-center"><a href="get-started.html">View Sample Notebooks</a></h4> + </section> <!-- Contact Us --> <section class="full-stripe"> <div class="ml-container ml-container--horizontally-center"> <div class="col col-12 content-group "> - <h2>Subscribe to Our Mailing Lists</h2> - <p>Subscribe to our development mailing list for SystemML updates and news. Once subscribed, <a href="mailto:{{ site.data.project.dev_list }}">join the conversation</a>. - As SystemML grows, so will our community. Check out <a href="community.html#mailing-list">All Mailing Lists</a>. + <h2>Contribute</h2> + <p>Contribute to Apache SystemML<sup>TM</sup> by subscribing to our developer mailing list for updates and news. Check out <a href="community.html#mailing-list">All Mailing Lists</a>. </p> </div> <div class="col col-12 content-group button-group"> <a href="mailto:{{ site.data.project.dev_list_subscribe }}?subject=send this email to subscribe" class="button button-primary">Subscribe</a> <a href="http://mail-archives.apache.org/mod_mbox/incubator-systemml-dev/"; target="_blank" class="button button-secondary">View Archive</a> + <a href="https://systemml.apache.org/roadmap"; target="_blank" class="button button-secondary">Roadmap</a> </div> </div> </section> http://git-wip-us.apache.org/repos/asf/incubator-systemml-website/blob/2137dcfd/_src/_sass/_base.scss ---------------------------------------------------------------------- diff --git a/_src/_sass/_base.scss b/_src/_sass/_base.scss index f8a0f85..3fefec5 100644 --- a/_src/_sass/_base.scss +++ b/_src/_sass/_base.scss @@ -30,6 +30,10 @@ p { margin: 0 0 1em 0; } +&.indent { + margin-left: 2.6em; +} + pre { padding: 2em; background: #ffffff; @@ -73,3 +77,8 @@ ol { figure { margin: 0; } + +.img-border { + border: 1px solid #e0e0e0; + margin: 1em 0 2em 0; +} http://git-wip-us.apache.org/repos/asf/incubator-systemml-website/blob/2137dcfd/_src/_sass/_config.scss ---------------------------------------------------------------------- diff --git a/_src/_sass/_config.scss b/_src/_sass/_config.scss index e965027..26b302d 100644 --- a/_src/_sass/_config.scss +++ b/_src/_sass/_config.scss @@ -234,7 +234,7 @@ $button-speed--faster : all .1s ease-in-out; // ============ $shadow-color : rgba(0, 0, 0, .1); -$shadow-default : 0 2px 2px 0 $shadow-color; //double check this +$shadow-default : 0px 2px 2px 0px $shadow-color; //double check this $shadow-toggle-color : rgb(77, 144, 254); $shadow-toggle : 0 0 5px 2px $shadow-toggle-color; // #4D90FE $shadow-checkbox-color : rgba(77, 144, 254, .5); http://git-wip-us.apache.org/repos/asf/incubator-systemml-website/blob/2137dcfd/_src/_sass/_icons.scss ---------------------------------------------------------------------- diff --git a/_src/_sass/_icons.scss b/_src/_sass/_icons.scss index 0416db7..77baebd 100644 --- a/_src/_sass/_icons.scss +++ b/_src/_sass/_icons.scss @@ -40,37 +40,37 @@ &.spark-logo { background-image: none, url('../img/spark-logo.png'); background-size: 70px 45px; - width: 70px; height: 55px; + width: 70px; height: 45px; } &.hadoop-logo { background-image: none, url('../img/hadoop-logo.png'); background-size: 60px 45px; - width: 60px; height: 55px; + width: 60px; height: 45px; } &.jupyter-logo { - background-image: none, url('../img/jupyter-logo.png'); + background-image: none, url('../img/jupyter-logo.svg'); background-size: 51px 55px; width: 51px; height: 55px; } &.zeppelin-logo { background-image: none, url('../img/zeppelin-logo.png'); background-size: 58px 35px; - width: 58px; height: 55px; + width: 58px; height: 35px; } &.dsx-logo { background-image: none, url('../img/dsx-logo.png'); background-size: 64px 27px; - width: 64px; height: 55px; + width: 64px; height: 27px; } &.python-logo { background-image: none, url('../img/python-logo-generic.svg'); background-size: 64px 27px; - width: 64px; height: 55px; + width: 64px; height: 27px; } &.r-logo { background-image: none, url('../img/r-logo.svg'); background-size: 64px 27px; - width: 64px; height: 55px; + width: 64px; height: 273px; } &.icon-announcement { background-image: none, url('../img/icon-announcment.svg'); @@ -79,26 +79,26 @@ } &-youtube { background-image: none, url('../img/icons/icon_youtube.svg'); - background-size: 60px 40px; - width: 60px; height: 40px; + background-size: 40px 40px; + width: 40px; height: 40px; } &-github { background-image: none, url('../img/icons/icon_github.svg'); - background-size: 60px 40px; - width: 60px; height: 40px; + background-size: 40px 40px; + width: 40px; height: 40px; } &-twitter { background-image: none, url('../img/icons/icon_twitter.svg'); - background-size: 60px 40px; - width: 60px; height: 40px; + background-size: 40px 40px; + width: 40px; height: 40px; } &-medium { background-image: none, url('../img/icons/icon_medium.svg'); - background-size: 60px 40px; - width: 60px; height: 40px; + background-size: 40px 40px; + width: 40px; height: 40px; } } http://git-wip-us.apache.org/repos/asf/incubator-systemml-website/blob/2137dcfd/_src/_sass/_layout.scss ---------------------------------------------------------------------- diff --git a/_src/_sass/_layout.scss b/_src/_sass/_layout.scss index b237618..222448d 100644 --- a/_src/_sass/_layout.scss +++ b/_src/_sass/_layout.scss @@ -1,5 +1,20 @@ @import 'layout/index'; +.flex-container { + @media (min-width: 80em) { + display: flex; + flex-direction: row; + flex-wrap: wrap; + margin: 0 auto; + h4 { + text-align: center; + } + .nb-card { + flex-basis: 30%; + } + } +} + // content container .ml-container { @@ -29,6 +44,10 @@ } } + &--stretch { + align-items: stretch; + } + &--halfway{ position: relative; top: 50%; http://git-wip-us.apache.org/repos/asf/incubator-systemml-website/blob/2137dcfd/_src/_sass/_modules.scss ---------------------------------------------------------------------- diff --git a/_src/_sass/_modules.scss b/_src/_sass/_modules.scss index c9be210..e9c88c8 100644 --- a/_src/_sass/_modules.scss +++ b/_src/_sass/_modules.scss @@ -117,6 +117,7 @@ padding-bottom: 56.25%; /* 16:9 */ padding-top: 25px; height: 0; + margin: 1em 0; } .video-wrapper iframe { position: absolute; @@ -125,3 +126,51 @@ width: 100%; height: 100%; } + +//Notebook Cards +.nb-card { + display: flex; + flex: 0 1 1; + flex-direction: column; + justify-content: flex-start; + padding: 1.25em; + background-color: #ffffff; + box-shadow: $shadow-default; + margin: 1em; + h3 { + margin-bottom: 1em; + } + .nb-link { + display: flex; + align-items: center; + .icon { + margin-right: 10px; + } + } +} + +//Horizontal Tabs +ul.ml-tabs { + list-style: none; + margin: 0 0 -3px 1em; + position: relative; + z-index: 2; + li { + display: inline-block; + padding: .5em 1em; + cursor: pointer; + &.current { + font-weight: 400; + background: #fff; + border: 1px solid #e0e0e0; + border-bottom: 0; + } + } +} +.tab-content { + display: none; + margin-top: 2px; + &.current { + display: block; + } +} http://git-wip-us.apache.org/repos/asf/incubator-systemml-website/blob/2137dcfd/_src/_scripts/main.js ---------------------------------------------------------------------- diff --git a/_src/_scripts/main.js b/_src/_scripts/main.js index 902354e..5f17843 100644 --- a/_src/_scripts/main.js +++ b/_src/_scripts/main.js @@ -18,6 +18,17 @@ $(document).ready(function() { $('.jq-modal').fitVids(); + //Call tabs for Install page + $('ul.ml-tabs li').click(function(){ + var tab_id = $(this).attr('data-tab'); + + $('ul.ml-tabs li').removeClass('current'); + $('.tab-content').removeClass('current'); + + $(this).addClass('current'); + $("#"+tab_id).addClass('current'); + }); + }); //End Ready...................................... http://git-wip-us.apache.org/repos/asf/incubator-systemml-website/blob/2137dcfd/_src/assets/img/jupyter-logo.svg ---------------------------------------------------------------------- diff --git a/_src/assets/img/jupyter-logo.svg b/_src/assets/img/jupyter-logo.svg new file mode 100644 index 0000000..674d8c2 --- /dev/null +++ b/_src/assets/img/jupyter-logo.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 261.25 259.88"><defs><style>.cls-1{fill:#e46e2e;}.cls-2{fill:#767474;}.cls-3{fill:#313940;}</style></defs><title>jupyter-logo</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><g id="Page-1"><g id="Artboard"><g id="Group-Copy-4-_-Group-_-Group-Copy" data-name="Group-Copy-4-+-Group-+-Group-Copy"><g id="Group-Copy-4"><path id="Fill-9" class="cls-1" d="M131,205.27c-42.59,0-79.68-15.31-99-37.93a105.21,105.21,0,0,0,198,0c-19.31,22.62-56.39,37.93-99,37.93"/><path id="Fill-10" class="cls-1" d="M131,58C173.62,58,210.7,73.35,230,96A105.21,105.21,0,0,0,32,96C51.35,73.35,88.44,58,131,58"/><path id="Fill-11" class="cls-2" d="M51.23,259.86a16.55,16.55,0,1,1,15.83-17.24A16.55,16.55,0,0,1,51.23,259.86Z"/><path id="Fill-12" class="cls-2" d="M38.53,44.37a10.34,10.34,0,1,1,9.89-10.78A10.34,10.34,0,0,1,38.53,44.37Z"/><path id="Fill-8" class="cls-2" d="M202.75,32.11a16.06,16.06,0,1,1,15.36-16.73A16.06,16.06,0,0,1,202.75 ,32.11Z"/><g id="Group-Copy"><path id="Fill-1" class="cls-3" d="M10.68,145.62c0,9.53-.74,12.65-2.73,15-1.74,1.89-4.64,2.79-7.95,3l.74,5.67c3.89,0,9.19-1.31,12.42-4.52,3.56-3.62,4.8-8.63,4.8-16.35V112.34H10.68v33.28"/><path id="Fill-2" class="cls-3" d="M65.07,141.27c0,4.11.08,7.72.33,10.85H58.95l-.41-6.49h-.17A15.1,15.1,0,0,1,45.12,153c-6.29,0-13.83-3.45-13.83-17.42V112.34h7.29v22c0,7.56,2.32,12.65,8.94,12.65a10.19,10.19,0,0,0,10.27-10.27v-24.4h7.29v28.92"/><path id="Fill-3" class="cls-3" d="M78.82,125.32c0-5.09-.17-9.2-.33-13H85l.33,6.82h.17c3-4.85,7.7-7.72,14.24-7.72,9.69,0,17,8.13,17,20.21,0,14.3-8.78,21.36-18.21,21.36-5.3,0-9.94-2.3-12.34-6.24H86v21.61h-7.2V125.32Zm7.2,10.6a16.13,16.13,0,0,0,.33,3,11.23,11.23,0,0,0,10.93,8.46c7.7,0,12.17-6.24,12.17-15.37,0-8-4.22-14.79-11.92-14.79A12.53,12.53,0,0,0,86,129.1v6.82Z"/><path id="Fill-4" class="cls-3" d="M129.65,112.34l8.78,23.5c.91,2.63,1.9,5.75,2.57,8.13h.17c.75-2.38,1.57-5.42,2.57-8.3l7.95-23.34h7.7l-10.93,28.35c-5.22,13.64-8.78,20 .62-13.74,24.9a19.8,19.8,0,0,1-8.94,4.68l-1.82-6.08a19.33,19.33,0,0,0,6.38-3.53,22,22,0,0,0,6.13-8.05,5.16,5.16,0,0,0,.58-1.73,6.24,6.24,0,0,0-.5-1.89l-14.82-36.65h7.95"/><path id="Fill-5" class="cls-3" d="M178.54,100.92v11.42H189v5.51H178.54v21.45c0,4.93,1.41,7.72,5.46,7.72a16.34,16.34,0,0,0,4.22-.49l.33,5.42a18,18,0,0,1-6.46,1c-3.39,0-6.13-1.07-7.87-3-2.07-2.14-2.81-5.67-2.81-10.35V117.85h-6.21v-5.51h6.21v-9.53l7.12-1.89"/><path id="Fill-6" class="cls-3" d="M202.38,133.54c.17,9.78,6.46,13.8,13.74,13.8a26.51,26.51,0,0,0,11.09-2.05l1.24,5.18a32.66,32.66,0,0,1-13.33,2.47c-12.34,0-19.7-8.05-19.7-20s7.12-21.45,18.79-21.45c13.08,0,16.56,11.42,16.56,18.73a27,27,0,0,1-.25,3.37Zm21.36-5.18c.08-4.6-1.9-11.75-10.1-11.75-7.37,0-10.6,6.74-11.18,11.75Z"/><path id="Fill-7" class="cls-3" d="M241.46,124.75c0-4.68-.08-8.71-.33-12.41h6.38l.25,7.81h.33c1.82-5.34,6.21-8.71,11.09-8.71a7.92,7.92,0,0,1,2.07.25v6.82a11.05,11.05,0,0,0-2.48-.25c-5.13,0-8.78,3.86-9.77,9.28a20.18,20.18,0,0,0-.33,3.37v21.2h-7. 2V124.75"/></g></g></g></g></g></g></g></svg> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-systemml-website/blob/2137dcfd/_src/assets/img/systemml-juypter-install-2.jpeg ---------------------------------------------------------------------- diff --git a/_src/assets/img/systemml-juypter-install-2.jpeg b/_src/assets/img/systemml-juypter-install-2.jpeg new file mode 100644 index 0000000..9d20a7f Binary files /dev/null and b/_src/assets/img/systemml-juypter-install-2.jpeg differ http://git-wip-us.apache.org/repos/asf/incubator-systemml-website/blob/2137dcfd/_src/assets/img/systemml-juypter-install.jpeg ---------------------------------------------------------------------- diff --git a/_src/assets/img/systemml-juypter-install.jpeg b/_src/assets/img/systemml-juypter-install.jpeg new file mode 100644 index 0000000..ba97eb7 Binary files /dev/null and b/_src/assets/img/systemml-juypter-install.jpeg differ
