Skip to content

Commit ae3fa2e

Browse files
update
1 parent ad80e7e commit ae3fa2e

File tree

2 files changed

+0
-10
lines changed

2 files changed

+0
-10
lines changed

tutorials/examples/train_discreteebm.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,9 @@
1919
from gfn.gflownet import FMGFlowNet
2020
from gfn.gym import DiscreteEBM
2121
from gfn.modules import DiscretePolicyEstimator
22-
<<<<<<< HEAD
23-
from gfn.utils.common import set_seed, validate
24-
from gfn.utils.modules import NeuralNet, Tabular
25-
=======
2622
from gfn.utils.common import set_seed
2723
from gfn.utils.modules import NeuralNet, Tabular
2824
from gfn.utils.training import validate
29-
>>>>>>> eedc7e8735f6dc4aafc748f149cbae24b47d9062
3025

3126
DEFAULT_SEED = 4444
3227

tutorials/examples/train_hypergrid.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,9 @@
2727
)
2828
from gfn.gym import HyperGrid
2929
from gfn.modules import DiscretePolicyEstimator, ScalarEstimator
30-
<<<<<<< HEAD
31-
from gfn.utils.common import set_seed, validate
32-
from gfn.utils.modules import DiscreteUniform, NeuralNet, Tabular
33-
=======
3430
from gfn.utils.common import set_seed
3531
from gfn.utils.modules import DiscreteUniform, NeuralNet, Tabular
3632
from gfn.utils.training import validate
37-
>>>>>>> eedc7e8735f6dc4aafc748f149cbae24b47d9062
3833

3934
DEFAULT_SEED = 4444
4035

0 commit comments

Comments
 (0)