Rui Wan commited on
Commit
e8e6dad
·
1 Parent(s): 7bb8939
Files changed (1) hide show
  1. model_fdm.py +0 -3
model_fdm.py CHANGED
@@ -5,10 +5,7 @@ from Dataset import DataAdditiveManufacturing, DataThermoforming
5
  from model import NeuralNetwork
6
 
7
  DEVICE = torch.device('cpu')
8
- <<<<<<< HEAD
9
 
10
- =======
11
- >>>>>>> 1951294 (update)
12
  # Set global plotting parameters
13
  plt.rcParams.update({'font.size': 14,
14
  'figure.figsize': (10, 8),
 
5
  from model import NeuralNetwork
6
 
7
  DEVICE = torch.device('cpu')
 
8
 
 
 
9
  # Set global plotting parameters
10
  plt.rcParams.update({'font.size': 14,
11
  'figure.figsize': (10, 8),