From 03115b84d321b8af168a024c962fbe56256a768f Mon Sep 17 00:00:00 2001 From: ZeroZeroJedenJeden <44526720+ZeroZeroJedenJeden@users.noreply.github.com> Date: Thu, 1 Nov 2018 17:40:54 +0100 Subject: [PATCH 01/27] Add files via upload --- ide/static/js/pane.js | 45 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/ide/static/js/pane.js b/ide/static/js/pane.js index 2f1f96217..4dfc75fe6 100644 --- a/ide/static/js/pane.js +++ b/ide/static/js/pane.js @@ -6,6 +6,7 @@ class Pane extends React.Component { constructor(props) { super(props); this.toggleClass= this.toggleClass.bind(this); + this.changeEvent= this.changeEvent.bind(this); this.state = { data: false, vision: false, @@ -68,6 +69,7 @@ class Pane extends React.Component { elem.style.display = 'none'; } } + this.changeEvent; for (let elem of $('.panel-heading')) { let _p = pattern ? 'false' : 'true'; if (elem.getAttribute('aria-expanded') == _p) { @@ -80,8 +82,49 @@ class Pane extends React.Component { }); } +changeEvent() { + var KerasLayers = ["RNN_Button", "GRU_Button", "LSTM_Button", "Embed_Button", "Eltwise_Button", "ThresholdedReLU", "ReLU_Button", "PReLU_Button", "Softmax_Button", "BatchNorm_Button", "GaussianNoise_Button", "GaussianDropout_Button", "AlphaDropout_Button", "TimeDistributed_Button", "Bidirectional_Button", "RepeatVector_Button", "Masking_Button", "Permute_Button", "InnerProduct_Button", "Deconvolution_Button", "Regularization_Button", "Softsign_Button", "Upsample_Button", "Pooling_Button", "LocallyConnected_Button"]; + var TensorFlowLayers = ["RNN_Button", "GRU_Button", "LSTM_Button", "Embed_Button", "Eltwise_Button", "ThresholdedReLU", "ReLU_Button", "PReLU_Button", "Softmax_Button", "BatchNorm_Button", "GaussianNoise_Button", "GaussianDropout_Button", "AlphaDropout_Button", "TimeDistributed_Button", "Bidirectional_Button", "RepeatVector_Button", "Masking_Button", "Permute_Button", "InnerProduct_Button", "Deconvolution_Button", "Regularization_Button", "Softsign_Button", "Upsample_Button", "Pooling_Button", "LocallyConnected_Button", "SoftmaxWithLoss_Button", "SigmoidCrossEntropyLoss_Button"]; + var CaffeLayers = ["ImageData_Button", "HDF5Data_Button", "HDF5Output_Button", "Input_Button", "WindowData_Button", "MemoryData_Button", "DummyData_Button", "Convolution_Button", "Pooling_Button", "SPP_Button", "Deconvolution_Button", "Recurrent_Button", "RNN_Button", "LSTM_Button", "LRN_Button", "MVN_Button", "BatchNorm_Button", "InnerProduct_Button", "Dropout_Button", "Embed_Button", "ReLU_Button", "PReLU_Button", "ELU_Button", "Sigmoid_Button", "TanH_Button", "AbsVal_Button", "Power_Button", "Exp_Button", "Log_Button", "BNLL_Button", "Threshold_Button", "Bias_Button", "Scale_Button", "Softplus_Button", "HardSigmoid_Button", "Flatten_Button", "Reshape_Button", "BatchReindex_Button", "Split_Button", "Concat_Button", "Eltwise_Button", "Filter_Button", "Reduction_Button", "Silence_Button", "ArgMax_Button", "Softmax_Button", "MultinomialLogisticLoss_Button", "InfogainLoss_Button", "SoftmaxWithLoss_Button", "EuclideanLoss_Button", "HingeLoss_Button", "SigmoidCrossEntropyLoss_Button", "Accuracy_Button", "ContrastiveLoss_Button", "Data_Button"]; + var CheckBoxA = this.refs.CheckBoxA; + var CheckBoxB = this.refs.CheckBoxB; + var CheckBoxC = this.refs.CheckBoxC; + var visible = []; + if(CheckBoxA.checked == false & CheckBoxB.checked == false & CheckBoxC.checked == false){ + for (let elem of $('.drowpdown-button')) { + elem.classList.remove("hide"); + } + } + if (this.refs.CheckBoxA.checked == true){ + visible = visible.concat(KerasLayers); + } + if (this.refs.CheckBoxB.checked == true){ + visible = visible.concat(TensorFlowLayers); + } + if (this.refs.CheckBoxC.checked == true){ + visible = visible.concat(CaffeLayers); + } + + for (let elem of $('.drowpdown-button')) { + for (let j = 0; j < visible.length; j++){ + let id = elem.id; + if(id == visible[j]){ + elem.classList.remove("hide"); + j = visible.length + 1; + }else{ + elem.classList.add("hide"); + } + } + } + + } + render() { return ( +
+
+
+
); } From 807afb633a537a1302738529387a914b5b34285d Mon Sep 17 00:00:00 2001 From: ZeroZeroJedenJeden <44526720+ZeroZeroJedenJeden@users.noreply.github.com> Date: Thu, 1 Nov 2018 17:51:45 +0100 Subject: [PATCH 02/27] Add files via upload --- ide/static/js/pane.js | 25 ++++++++++++++++++++++--- ide/static/js/paneElement.js | 2 +- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/ide/static/js/pane.js b/ide/static/js/pane.js index 4dfc75fe6..8bd9c2a2c 100644 --- a/ide/static/js/pane.js +++ b/ide/static/js/pane.js @@ -83,9 +83,28 @@ class Pane extends React.Component { } changeEvent() { - var KerasLayers = ["RNN_Button", "GRU_Button", "LSTM_Button", "Embed_Button", "Eltwise_Button", "ThresholdedReLU", "ReLU_Button", "PReLU_Button", "Softmax_Button", "BatchNorm_Button", "GaussianNoise_Button", "GaussianDropout_Button", "AlphaDropout_Button", "TimeDistributed_Button", "Bidirectional_Button", "RepeatVector_Button", "Masking_Button", "Permute_Button", "InnerProduct_Button", "Deconvolution_Button", "Regularization_Button", "Softsign_Button", "Upsample_Button", "Pooling_Button", "LocallyConnected_Button"]; - var TensorFlowLayers = ["RNN_Button", "GRU_Button", "LSTM_Button", "Embed_Button", "Eltwise_Button", "ThresholdedReLU", "ReLU_Button", "PReLU_Button", "Softmax_Button", "BatchNorm_Button", "GaussianNoise_Button", "GaussianDropout_Button", "AlphaDropout_Button", "TimeDistributed_Button", "Bidirectional_Button", "RepeatVector_Button", "Masking_Button", "Permute_Button", "InnerProduct_Button", "Deconvolution_Button", "Regularization_Button", "Softsign_Button", "Upsample_Button", "Pooling_Button", "LocallyConnected_Button", "SoftmaxWithLoss_Button", "SigmoidCrossEntropyLoss_Button"]; - var CaffeLayers = ["ImageData_Button", "HDF5Data_Button", "HDF5Output_Button", "Input_Button", "WindowData_Button", "MemoryData_Button", "DummyData_Button", "Convolution_Button", "Pooling_Button", "SPP_Button", "Deconvolution_Button", "Recurrent_Button", "RNN_Button", "LSTM_Button", "LRN_Button", "MVN_Button", "BatchNorm_Button", "InnerProduct_Button", "Dropout_Button", "Embed_Button", "ReLU_Button", "PReLU_Button", "ELU_Button", "Sigmoid_Button", "TanH_Button", "AbsVal_Button", "Power_Button", "Exp_Button", "Log_Button", "BNLL_Button", "Threshold_Button", "Bias_Button", "Scale_Button", "Softplus_Button", "HardSigmoid_Button", "Flatten_Button", "Reshape_Button", "BatchReindex_Button", "Split_Button", "Concat_Button", "Eltwise_Button", "Filter_Button", "Reduction_Button", "Silence_Button", "ArgMax_Button", "Softmax_Button", "MultinomialLogisticLoss_Button", "InfogainLoss_Button", "SoftmaxWithLoss_Button", "EuclideanLoss_Button", "HingeLoss_Button", "SigmoidCrossEntropyLoss_Button", "Accuracy_Button", "ContrastiveLoss_Button", "Data_Button"]; + var KerasLayers = ["RNN_Button", "GRU_Button", "LSTM_Button", "Embed_Button", "Eltwise_Button", + "ThresholdedReLU", "ReLU_Button", "PReLU_Button", "Softmax_Button", "BatchNorm_Button", + "GaussianNoise_Button", "GaussianDropout_Button", "AlphaDropout_Button", "TimeDistributed_Button", + "Bidirectional_Button", "RepeatVector_Button", "Masking_Button", "Permute_Button", "InnerProduct_Button", + "Deconvolution_Button", "Regularization_Button", "Softsign_Button", "Upsample_Button", "Pooling_Button", + "LocallyConnected_Button"]; + var TensorFlowLayers = ["RNN_Button", "GRU_Button", "LSTM_Button", "Embed_Button", "Eltwise_Button", + "ThresholdedReLU", "ReLU_Button", "PReLU_Button", "Softmax_Button", "BatchNorm_Button", "GaussianNoise_Button", + "GaussianDropout_Button", "AlphaDropout_Button", "TimeDistributed_Button", "Bidirectional_Button", + "RepeatVector_Button", "Masking_Button", "Permute_Button", "InnerProduct_Button", "Deconvolution_Button", + "Regularization_Button", "Softsign_Button", "Upsample_Button", "Pooling_Button", "LocallyConnected_Button", + "SoftmaxWithLoss_Button", "SigmoidCrossEntropyLoss_Button"]; + var CaffeLayers = ["ImageData_Button", "HDF5Data_Button", "HDF5Output_Button", "Input_Button", "WindowData_Button", + "MemoryData_Button", "DummyData_Button", "Convolution_Button", "Pooling_Button", "SPP_Button", "Deconvolution_Button", + "Recurrent_Button", "RNN_Button", "LSTM_Button", "LRN_Button", "MVN_Button", "BatchNorm_Button", + "InnerProduct_Button", "Dropout_Button", "Embed_Button", "ReLU_Button", "PReLU_Button", "ELU_Button", + "Sigmoid_Button", "TanH_Button", "AbsVal_Button", "Power_Button", "Exp_Button", "Log_Button", "BNLL_Button", + "Threshold_Button", "Bias_Button", "Scale_Button", "Softplus_Button", "HardSigmoid_Button", "Flatten_Button", + "Reshape_Button", "BatchReindex_Button", "Split_Button", "Concat_Button", "Eltwise_Button", "Filter_Button", + "Reduction_Button", "Silence_Button", "ArgMax_Button", "Softmax_Button", "MultinomialLogisticLoss_Button", + "InfogainLoss_Button", "SoftmaxWithLoss_Button", "EuclideanLoss_Button", "HingeLoss_Button", + "SigmoidCrossEntropyLoss_Button", "Accuracy_Button", "ContrastiveLoss_Button", "Data_Button"]; var CheckBoxA = this.refs.CheckBoxA; var CheckBoxB = this.refs.CheckBoxB; var CheckBoxC = this.refs.CheckBoxC; diff --git a/ide/static/js/paneElement.js b/ide/static/js/paneElement.js index f1f8f98f2..0d77a0985 100644 --- a/ide/static/js/paneElement.js +++ b/ide/static/js/paneElement.js @@ -11,7 +11,7 @@ class PaneElement extends React.Component { render() { return (
Date: Thu, 1 Nov 2018 19:01:21 +0100 Subject: [PATCH 03/27] Update adding_new_layers.md --- tutorials/adding_new_layers.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tutorials/adding_new_layers.md b/tutorials/adding_new_layers.md index 393fe176e..e7d0a54a7 100644 --- a/tutorials/adding_new_layers.md +++ b/tutorials/adding_new_layers.md @@ -52,6 +52,7 @@ - Now, add a new line for the layer you just added in ```data.js``` in the section of Activation/Neuron Layer, because this layer belongs to this category. - ```your_layer_name``` this line will make your layer visible in Fabrik. +- Add ```"your_layer_id"``` to 1 of 3 framework filter array ```var KerasLayers = [...]```, ```var TensorFlowLayers = [...]``` or ```var CaffeLayers = []```. This should be like this ```var KerasLayers = ["RNN_Button", "GRU_Button", "your_layer_id"]```. This arrays are placed inside ```changeEvent() {}``` function. ### Adding layer handling to the backend @@ -87,4 +88,4 @@ - Check the new layer inside the category you added it. See if all the parameters are properly displayed and usable as you wanted. - If everything is working fine commit your changes and push it to your fork then make a Pull Request. -- Congratulations! Happy contributing :-) \ No newline at end of file +- Congratulations! Happy contributing :-) From db576e364d73ecf75d900b2ef9f95c9ac37db1d2 Mon Sep 17 00:00:00 2001 From: ZeroZeroJedenJeden <44526720+ZeroZeroJedenJeden@users.noreply.github.com> Date: Thu, 1 Nov 2018 19:03:01 +0100 Subject: [PATCH 04/27] Update adding_new_layers.md --- tutorials/adding_new_layers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutorials/adding_new_layers.md b/tutorials/adding_new_layers.md index e7d0a54a7..de0736110 100644 --- a/tutorials/adding_new_layers.md +++ b/tutorials/adding_new_layers.md @@ -52,7 +52,7 @@ - Now, add a new line for the layer you just added in ```data.js``` in the section of Activation/Neuron Layer, because this layer belongs to this category. - ```your_layer_name``` this line will make your layer visible in Fabrik. -- Add ```"your_layer_id"``` to 1 of 3 framework filter array ```var KerasLayers = [...]```, ```var TensorFlowLayers = [...]``` or ```var CaffeLayers = []```. This should be like this ```var KerasLayers = ["RNN_Button", "GRU_Button", "your_layer_id"]```. This arrays are placed inside ```changeEvent() {}``` function. +- Add ```"your_layer_id"``` to 1(or more) of 3 framework filter array ```var KerasLayers = [...]```, ```var TensorFlowLayers = [...]``` or ```var CaffeLayers = [...]```. This should be like this ```var KerasLayers = ["RNN_Button", "GRU_Button", "your_layer_id"]```. This arrays are placed inside ```changeEvent() {}``` function. ### Adding layer handling to the backend From 7e197ff0d3be75dfc4a1c28e8f4dad9050be8304 Mon Sep 17 00:00:00 2001 From: ZeroZeroJedenJeden <44526720+ZeroZeroJedenJeden@users.noreply.github.com> Date: Fri, 2 Nov 2018 07:39:19 +0100 Subject: [PATCH 05/27] Add files via upload --- ide/static/js/pane.js | 49 ++++++++++++++++++++++++++++++++----------- 1 file changed, 37 insertions(+), 12 deletions(-) diff --git a/ide/static/js/pane.js b/ide/static/js/pane.js index 8bd9c2a2c..ce16c540e 100644 --- a/ide/static/js/pane.js +++ b/ide/static/js/pane.js @@ -88,13 +88,13 @@ changeEvent() { "GaussianNoise_Button", "GaussianDropout_Button", "AlphaDropout_Button", "TimeDistributed_Button", "Bidirectional_Button", "RepeatVector_Button", "Masking_Button", "Permute_Button", "InnerProduct_Button", "Deconvolution_Button", "Regularization_Button", "Softsign_Button", "Upsample_Button", "Pooling_Button", - "LocallyConnected_Button"]; + "LocallyConnected_Button", "Crop_Button"]; var TensorFlowLayers = ["RNN_Button", "GRU_Button", "LSTM_Button", "Embed_Button", "Eltwise_Button", "ThresholdedReLU", "ReLU_Button", "PReLU_Button", "Softmax_Button", "BatchNorm_Button", "GaussianNoise_Button", "GaussianDropout_Button", "AlphaDropout_Button", "TimeDistributed_Button", "Bidirectional_Button", "RepeatVector_Button", "Masking_Button", "Permute_Button", "InnerProduct_Button", "Deconvolution_Button", "Regularization_Button", "Softsign_Button", "Upsample_Button", "Pooling_Button", "LocallyConnected_Button", - "SoftmaxWithLoss_Button", "SigmoidCrossEntropyLoss_Button"]; + "SoftmaxWithLoss_Button", "SigmoidCrossEntropyLoss_Button", "Crop_Button", "DepthwiseConv_Button"]; var CaffeLayers = ["ImageData_Button", "HDF5Data_Button", "HDF5Output_Button", "Input_Button", "WindowData_Button", "MemoryData_Button", "DummyData_Button", "Convolution_Button", "Pooling_Button", "SPP_Button", "Deconvolution_Button", "Recurrent_Button", "RNN_Button", "LSTM_Button", "LRN_Button", "MVN_Button", "BatchNorm_Button", @@ -104,23 +104,23 @@ changeEvent() { "Reshape_Button", "BatchReindex_Button", "Split_Button", "Concat_Button", "Eltwise_Button", "Filter_Button", "Reduction_Button", "Silence_Button", "ArgMax_Button", "Softmax_Button", "MultinomialLogisticLoss_Button", "InfogainLoss_Button", "SoftmaxWithLoss_Button", "EuclideanLoss_Button", "HingeLoss_Button", - "SigmoidCrossEntropyLoss_Button", "Accuracy_Button", "ContrastiveLoss_Button", "Data_Button"]; - var CheckBoxA = this.refs.CheckBoxA; - var CheckBoxB = this.refs.CheckBoxB; - var CheckBoxC = this.refs.CheckBoxC; + "SigmoidCrossEntropyLoss_Button", "Accuracy_Button", "ContrastiveLoss_Button", "Data_Button", "Crop_Button"]; + var CheckBoxA = document.getElementById("CheckBoxA"); + var CheckBoxB = document.getElementById("CheckBoxB"); + var CheckBoxC = document.getElementById("CheckBoxC"); var visible = []; if(CheckBoxA.checked == false & CheckBoxB.checked == false & CheckBoxC.checked == false){ for (let elem of $('.drowpdown-button')) { elem.classList.remove("hide"); } } - if (this.refs.CheckBoxA.checked == true){ + if (CheckBoxA.checked == true){ visible = visible.concat(KerasLayers); } - if (this.refs.CheckBoxB.checked == true){ + if (CheckBoxB.checked == true){ visible = visible.concat(TensorFlowLayers); } - if (this.refs.CheckBoxC.checked == true){ + if (CheckBoxC.checked == true){ visible = visible.concat(CaffeLayers); } @@ -141,9 +141,34 @@ changeEvent() { render() { return (
-
-
-
+
+
+ + +
+
+