Fixing merge conflicts

Author: marcromeyn

tests/unit/torch/test_batch.py

@@ -57,10 +57,7 @@ def test_init_tensor_lengths(self):
         assert isinstance(sequence.lengths, dict)
         assert "default" in sequence.lengths
         assert torch.equal(sequence.lengths["default"], lengths)
-<<<<<<< HEAD
         assert sequence.device() == lengths.device
-=======
->>>>>>> f7011343 (Increase test-coverage)
 
     def test_init_tensor_masks(self):
         # Test when masks is a tensor
@@ -95,15 +92,12 @@ def test_init_invalid_masks(self):
         with pytest.raises(ValueError, match="Masks must be a tensor or a dictionary of tensors"):
             Sequence(lengths, masks)
 
-<<<<<<< HEAD
     def test_device(self):
         empty_seq = Sequence({})
 
         with pytest.raises(ValueError, match="Sequence is empty"):
             empty_seq.device()
 
-=======
->>>>>>> f7011343 (Increase test-coverage)
 
 class TestBatch:
     @pytest.fixture
@@ -142,10 +136,7 @@ def test_batch_init_tensor_target(self):
         assert isinstance(batch.targets, dict)
         assert "default" in batch.targets
         assert torch.equal(batch.targets["default"], targets)
-<<<<<<< HEAD
         assert batch.device() == features.device
-=======
->>>>>>> f7011343 (Increase test-coverage)
 
     def test_batch_init_invalid_targets(self):
         # Test when targets is not a tensor nor a dictionary of tensors

tests/unit/torch/test_block.py

@@ -85,8 +85,6 @@ def test_repeat(self):
 
         with pytest.raises(ValueError, match="n must be greater than 0"):
             block.repeat(0)
-<<<<<<< HEAD
-<<<<<<< HEAD
 
     def test_repeat_with_link(self):
         block = Block(PlusOne())
@@ -114,8 +112,6 @@ def forward(self, inputs):
 
         inputs = torch.randn(1, 3)
         assert torch.equal(block(inputs), inputs + 1)
-=======
->>>>>>> 77ca69b4 (Adding ParallelBlock)
 
 
 class TestParallelBlock:
@@ -224,8 +220,3 @@ def test_getitem(self):
 
         with pytest.raises(IndexError):
             pb["invalid_key"]
-<<<<<<< HEAD
-=======
->>>>>>> f7011343 (Increase test-coverage)
-=======
->>>>>>> 77ca69b4 (Adding ParallelBlock)