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

Jump to bottom

[WIP] Migrate JS/font etc dependencies to webjars #7046

Merged
merged 18 commits into from Jan 22, 2019
Merged

[WIP] Migrate JS/font etc dependencies to webjars #7046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
eb73f41
Migrate to webjars, pt1
AlexDBlack Jan 19, 2019
22f6a17
Migrate to webjars, pt2
AlexDBlack Jan 19, 2019
559cf96
Migrate to webjars, pt3
AlexDBlack Jan 19, 2019
0cb7711
Migrate to webjars, pt4
AlexDBlack Jan 21, 2019
7b52239
TSNE fixes, remove deeplearning4j-ui-resources
AlexDBlack Jan 21, 2019
fe2f229
Arbiter UI cleanup
AlexDBlack Jan 21, 2019
d953448
Arbiter UI cleanup
AlexDBlack Jan 21, 2019
2fb2d93
More cleanup/fixes
AlexDBlack Jan 21, 2019
76eaa5a
More cleanup
AlexDBlack Jan 21, 2019
67a0d2a
More cleanup
AlexDBlack Jan 21, 2019
a9d6a23
Font cleanup, pt1
AlexDBlack Jan 21, 2019
a5f82bd
CSS and fonts cleanup
AlexDBlack Jan 21, 2019
5861a35
Delet unused/old JS resources
AlexDBlack Jan 21, 2019
30bb6bd
Fix DL4J UI model page (cytoscape)
AlexDBlack Jan 22, 2019
b787598
Fix DL4J UI model page (cytoscape)
AlexDBlack Jan 22, 2019
c59860f
Small TSNE fix
AlexDBlack Jan 22, 2019
23ca54a
Remove debug logging from UI assets serving
AlexDBlack Jan 22, 2019
66591ef
Final arbiter fix
AlexDBlack Jan 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 0 additions & 5 deletions arbiter/arbiter-ui/src/main/resources/deeplearning4jUiAssets/css/arbiter/bootstrap.min.css
View file
Open in desktop

This file was deleted.

1,225 changes: 0 additions & 1,225 deletions arbiter/arbiter-ui/src/main/resources/deeplearning4jUiAssets/css/arbiter/jquery-ui.css
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions arbiter/arbiter-ui/src/main/resources/deeplearning4jUiAssets/js/arbiter/bootstrap.min.js
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions arbiter/arbiter-ui/src/main/resources/deeplearning4jUiAssets/js/arbiter/d3.min.js
View file
Open in desktop

This file was deleted.

9,789 changes: 0 additions & 9,789 deletions arbiter/arbiter-ui/src/main/resources/deeplearning4jUiAssets/js/arbiter/jquery-1.10.2.js
View file
Open in desktop

This file was deleted.

16,617 changes: 0 additions & 16,617 deletions arbiter/arbiter-ui/src/main/resources/deeplearning4jUiAssets/js/arbiter/jquery-ui.js
View file
Open in desktop

This file was deleted.

558 changes: 279 additions & 279 deletions ...biter-ui/src/main/scala/org/deeplearning4j/arbiter/ui/views/html/ArbiterUI.template.scala
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 6 additions & 7 deletions arbiter/arbiter-ui/src/main/views/org/deeplearning4j/arbiter/ui/views/ArbiterUI.scala.html
View file
Open in desktop
Expand Up @@ -183,13 +183,12 @@
</head>
<body class="bgcolor">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="/assets/css/arbiter/bootstrap.min.css">
<script src="/assets/js/jquery-1.9.1.min.js"></script>
<link rel="stylesheet" href="/assets/css/arbiter/jquery-ui.css">
<script src="/assets/js/arbiter/jquery-1.10.2.js"></script>
<script src="/assets/js/arbiter/jquery-ui.js"></script>
<script src="/assets/js/arbiter/d3.min.js"></script>
<script src="/assets/js/arbiter/bootstrap.min.js"></script>
<link id="bootstrap-style" href="/assets/webjars/bootstrap/2.3.1/css/bootstrap.min.css" rel="stylesheet">
<script src="/assets/webjars/jquery/2.2.0/jquery.min.js"></script>
<link href="/assets/webjars/jquery-ui/1.10.2/themes/base/jquery-ui.css" rel="stylesheet">
<script src="/assets/webjars/jquery-ui/1.10.2/ui/minified/jquery-ui.min.js"></script>
<script src="/assets/webjars/d3js/3.3.5/d3.min.js" charset="utf-8"></script>
<script src="/assets/webjars/bootstrap/2.3.1/js/bootstrap.min.js"></script>
<script src="/assets/dl4j-ui.js"></script>

<script>
Expand Down
3 changes: 3 additions & 0 deletions arbiter/arbiter-ui/src/test/java/org/deeplearning4j/arbiter/optimize/TestBasic.java
View file
Open in desktop
Expand Up @@ -55,7 +55,9 @@
import org.junit.Ignore;
import org.junit.Test;
import org.nd4j.linalg.activations.Activation;
import org.nd4j.linalg.api.buffer.DataType;
import org.nd4j.linalg.dataset.api.iterator.DataSetIterator;
import org.nd4j.linalg.factory.Nd4j;
import org.nd4j.linalg.lossfunctions.LossFunctions;

import java.io.File;
Expand Down Expand Up @@ -83,6 +85,7 @@ public void testBasicUiOnly() throws Exception {
@Test
@Ignore
public void testBasicMnist() throws Exception {
Nd4j.setDefaultDataTypes(DataType.FLOAT, DataType.FLOAT);

MultiLayerSpace mls = new MultiLayerSpace.Builder()
.updater(new SgdSpace(new ContinuousParameterSpace(0.0001, 0.2)))
Expand Down
152 changes: 152 additions & 0 deletions deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-play/pom.xml
View file
Open in desktop
Expand Up @@ -306,6 +306,158 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>


<!-- WebJars Dependencies -->
<dependency>
<groupId>org.webjars</groupId>
<artifactId>bootstrap</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>jquery</artifactId>
<version>2.2.0</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>jquery-migrate</artifactId>
<version>1.2.1</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>jquery-ui</artifactId>
<version>1.10.2</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>modernizr</artifactId>
<!--<version>2.6.2</version>-->
<version>2.8.3-1</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>jquery-cookie</artifactId>
<version>1.4.1-1</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>fullcalendar</artifactId>
<version>1.6.4</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>excanvas</artifactId>
<version>3</version>
</dependency>
<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>cytoscape</artifactId>
<version>3.2.5</version>
</dependency>
<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>cytoscape-dagre</artifactId>
<version>2.1.0</version>
</dependency>
<dependency>
<groupId>org.webjars.npm</groupId>
<artifactId>dagre</artifactId>
<version>0.8.4</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>retinajs</artifactId>
<version>0.0.2</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>flot</artifactId>
<version>0.8.3</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>chosen</artifactId>
<version>0.9.8</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>uniform</artifactId>
<version>2.1.2-1</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>noty</artifactId>
<version>2.2.2</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>jquery-raty</artifactId>
<version>2.5.2</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>imagesloaded</artifactId>
<version>2.1.1</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>masonry</artifactId>
<version>3.1.5</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>jquery.sparkline</artifactId>
<version>2.1.2</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>jquery-knob</artifactId>
<version>1.2.2</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>datatables</artifactId>
<version>1.9.4</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>jquery-ui-touch-punch</artifactId>
<version>0.2.2</version>
</dependency>

<dependency>
<groupId>org.webjars</groupId>
<artifactId>d3js</artifactId>
<version>3.3.5</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>bootstrap-notify</artifactId>
<version>3.1.3-1</version>
</dependency>
<dependency>
<groupId>org.webjars.npm</groupId>
<artifactId>github-com-jboesch-Gritter</artifactId>
<version>1.7.4</version>
</dependency>

<!-- Fonts -->
<dependency>
<groupId>org.webjars.bowergithub.stenin-nikita</groupId>
<artifactId>open-sans</artifactId>
<version>0.1.3</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>font-awesome</artifactId>
<version>3.0.2</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
<artifactId>bootstrap-glyphicons</artifactId>
<version>bdd2cbfba0</version>
</dependency>
</dependencies>


Expand Down
12 changes: 8 additions & 4 deletions ...ent/deeplearning4j-play/src/main/java/org/deeplearning4j/ui/play/staticroutes/Assets.java
View file
Open in desktop
Expand Up @@ -42,15 +42,19 @@ public class Assets implements Function<String, Result> {

@Override
public Result apply(String s) {
String fullPath = assetsRootDirectory + s;

String fullPath;
if(s.startsWith("webjars/")){
fullPath = "META-INF/resources/" + s;
} else {
fullPath = assetsRootDirectory + s;
}

InputStream inputStream;
try {
inputStream = new ClassPathResource(fullPath).getInputStream();
} catch (Exception e) {
log.debug("Could not find asset: {}", s);
return ok();
} catch (Throwable t) {
log.warn("Could not find requested UI asset: {}", s, t);
return ok();
}

Expand Down