Merge pull request verivital#32 from verivital/master

cav2023 and mac matconvnet
pkrobinette · Apr 19, 2023 · f74c749 · f74c749
2 parents ad4a82e + 4e1c04d
commit f74c749
Show file tree

Hide file tree

Showing 17 changed files with 25 additions and 21 deletions.
diff --git a/code/nnv/engine/matconvnet/vl_imreadjpeg.mexmaci64 b/code/nnv/engine/matconvnet/vl_imreadjpeg.mexmaci64
diff --git a/code/nnv/engine/matconvnet/vl_imreadjpeg_old.mexmaci64 b/code/nnv/engine/matconvnet/vl_imreadjpeg_old.mexmaci64
diff --git a/code/nnv/engine/matconvnet/vl_nnbilinearsampler.mexmaci64 b/code/nnv/engine/matconvnet/vl_nnbilinearsampler.mexmaci64
diff --git a/code/nnv/engine/matconvnet/vl_nnbnorm.mexmaci64 b/code/nnv/engine/matconvnet/vl_nnbnorm.mexmaci64
diff --git a/code/nnv/engine/matconvnet/vl_nnconv.mexmaci64 b/code/nnv/engine/matconvnet/vl_nnconv.mexmaci64
diff --git a/code/nnv/engine/matconvnet/vl_nnconvt.mexmaci64 b/code/nnv/engine/matconvnet/vl_nnconvt.mexmaci64
diff --git a/code/nnv/engine/matconvnet/vl_nnnormalize.mexmaci64 b/code/nnv/engine/matconvnet/vl_nnnormalize.mexmaci64
diff --git a/code/nnv/engine/matconvnet/vl_nnnormalizelp.mexmaci64 b/code/nnv/engine/matconvnet/vl_nnnormalizelp.mexmaci64
diff --git a/code/nnv/engine/matconvnet/vl_nnpool.mexmaci64 b/code/nnv/engine/matconvnet/vl_nnpool.mexmaci64
diff --git a/code/nnv/engine/matconvnet/vl_nnroipool.mexmaci64 b/code/nnv/engine/matconvnet/vl_nnroipool.mexmaci64
diff --git a/code/nnv/engine/matconvnet/vl_taccummex.mexmaci64 b/code/nnv/engine/matconvnet/vl_taccummex.mexmaci64
diff --git a/code/nnv/engine/matconvnet/vl_tmove.mexmaci64 b/code/nnv/engine/matconvnet/vl_tmove.mexmaci64
diff --git a/code/nnv/examples/NNV2.0/Submission/CAV2023/NNV_vs_MATLAB/rl_benchmarks/load_rl_NNs.m b/code/nnv/examples/NNV2.0/Submission/CAV2023/NNV_vs_MATLAB/rl_benchmarks/load_rl_NNs.m
@@ -9,22 +9,28 @@
     t = tic;
     for h = 1:length(listNN) % generlize NN loading options for all benchmarks
         if endsWith(listNN(h).name, ".onnx")
-            net = importONNXNetwork(benchmarkFolder+string(listNN(h).name), InputDataFormats="BC");
-            % transform for matlab
-            if ~contains(listNN(h).name, "dubins")
-                Layers = net.Layers([1,4:end-1]);
-                net = dlnetwork(Layers);
+            if is_codeocean % error with swing (some internal operations not available when running -nodesktop)
+                modelname = split(listNN(h).name,'.');
+                net = load(benchmarkFolder+string(modelname{1})+".mat");
+                net = net.net;
             else
-                Layers = net.Layers;
-                ils = [];
-                for k=1:length(Layers)-1
-                    if isa(Layers(k), "nnet.onnx.layer.ElementwiseAffineLayer")
-                        Layers(k-1).Bias = Layers(k).Offset;
-                    else
-                        ils = [ils k];
+                net = importONNXNetwork(benchmarkFolder+string(listNN(h).name), InputDataFormats="BC");
+                % transform for matlab
+                if ~contains(listNN(h).name, "dubins")
+                    Layers = net.Layers([1,4:end-1]);
+                    net = dlnetwork(Layers);
+                else
+                    Layers = net.Layers;
+                    ils = [];
+                    for k=1:length(Layers)-1
+                        if isa(Layers(k), "nnet.onnx.layer.ElementwiseAffineLayer")
+                            Layers(k-1).Bias = Layers(k).Offset;
+                        else
+                            ils = [ils k];
+                        end
                     end
+                    net = dlnetwork(net.Layers(ils));
                 end
-                net = dlnetwork(net.Layers(ils));
             end
             nn = matlab2nnv(net);
             % store networks
@@ -39,11 +45,5 @@
     t = toc(t);
     names2idxs = containers.Map(names,idxs);
     disp("All networks are loaded in " + string(t) + " seconds");
-    % Remove extra files
-    try 
-        rmdir +cartpole s
-    end
-    try
-        rmdir +lunarlander s
-    end
+
 end
diff --git a/code/nnv/examples/NNV2.0/Submission/CAV2023/NNV_vs_MATLAB/rl_benchmarks/onnx/cartpole.mat b/code/nnv/examples/NNV2.0/Submission/CAV2023/NNV_vs_MATLAB/rl_benchmarks/onnx/cartpole.mat
diff --git a/.../nnv/examples/NNV2.0/Submission/CAV2023/NNV_vs_MATLAB/rl_benchmarks/onnx/dubinsrejoin.mat b/.../nnv/examples/NNV2.0/Submission/CAV2023/NNV_vs_MATLAB/rl_benchmarks/onnx/dubinsrejoin.mat
diff --git a/code/nnv/examples/NNV2.0/Submission/CAV2023/NNV_vs_MATLAB/rl_benchmarks/onnx/lunarlander.mat b/code/nnv/examples/NNV2.0/Submission/CAV2023/NNV_vs_MATLAB/rl_benchmarks/onnx/lunarlander.mat
diff --git a/code/nnv/examples/NNV2.0/Submission/CAV2023/RNN/create_figure.m b/code/nnv/examples/NNV2.0/Submission/CAV2023/RNN/create_figure.m
@@ -40,7 +40,11 @@ function create_figure()
     ax.XAxis.FontSize = 15; % Set font size of axis
     ax.YAxis.FontSize = 15;
     % save plot
-    exportgraphics(f, "rnn_verification_time.pdf", "ContentType","vector");
+    if is_codeocean
+        exportgraphics(f,'/results/logs/rnn_verification_time.pdf', 'ContentType', 'vector');
+    else
+        exportgraphics(f, "rnn_verification_time.pdf",'ContentType', 'vector');
+    end
 
 end