From e839d910ca429d76166f2f051add3af601d7613f Mon Sep 17 00:00:00 2001
From: Carel van Niekerk <carel.niekerk@hhu.de>
Date: Wed, 29 Jun 2022 16:01:02 +0200
Subject: [PATCH] Bug fixes

---
 convlab/dst/setsumbt/do/nbt.py                       |  2 +-
 convlab/dst/setsumbt/unified_format_data/Tracker.py  |  9 ---------
 convlab/dst/setsumbt/unified_format_data/__init__.py |  4 ++--
 .../setsumbt/unified_format_data/dataset/__init__.py | 12 ------------
 .../unified_format_data/dataset/unified_format.py    |  2 +-
 .../setsumbt/unified_format_data/dataset/utils.py    |  2 +-
 setup.py                                             |  2 +-
 7 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/convlab/dst/setsumbt/do/nbt.py b/convlab/dst/setsumbt/do/nbt.py
index 3f4a98c3..e0b74516 100644
--- a/convlab/dst/setsumbt/do/nbt.py
+++ b/convlab/dst/setsumbt/do/nbt.py
@@ -31,7 +31,7 @@ from convlab.dst.setsumbt.modeling.bert_nbt import BertSetSUMBT
 from convlab.dst.setsumbt.modeling.roberta_nbt import RobertaSetSUMBT
 from convlab.dst.setsumbt.unified_format_data import unified_format
 from convlab.dst.setsumbt.modeling import training
-from convlab.dst.setsumbt.multiwoz import ontology as embeddings
+from convlab.dst.setsumbt.unified_format_data.dataset import ontology as embeddings
 from convlab.dst.setsumbt.utils import get_args, update_args
 # from convlab.dst.setsumbt.modeling import ensemble_utils
 
diff --git a/convlab/dst/setsumbt/unified_format_data/Tracker.py b/convlab/dst/setsumbt/unified_format_data/Tracker.py
index 27d059ba..5fa8bb57 100644
--- a/convlab/dst/setsumbt/unified_format_data/Tracker.py
+++ b/convlab/dst/setsumbt/unified_format_data/Tracker.py
@@ -10,20 +10,11 @@ from transformers import (BertModel, BertConfig, BertTokenizer,
 from convlab.dst.setsumbt.modeling import (RobertaSetSUMBT,
                                             BertSetSUMBT)
 
-<<<<<<<< HEAD:convlab/dst/setsumbt/multiwoz/Tracker.py
 from convlab.dst.dst import DST
 from convlab.util.multiwoz.state import default_state
 from convlab.util.multiwoz.multiwoz_slot_trans import REF_SYS_DA, REF_USR_DA
 from convlab.dst.rule.multiwoz import normalize_value
 from convlab.util.custom_util import model_downloader
-========
-from convlab2.dst.dst import DST
-from convlab2.util.multiwoz.state import default_state
-from convlab2.util.multiwoz.multiwoz_slot_trans import REF_SYS_DA, REF_USR_DA
-from convlab2.dst.rule.multiwoz import normalize_value
-from convlab2.util.custom_util import model_downloader
-from convlab2.dst.setsumbt.modeling.training import set_ontology_embeddings
->>>>>>>> setsumbt_unifiedformat:convlab2/dst/setsumbt/unified_format_data/Tracker.py
 
 USE_CUDA = torch.cuda.is_available()
 
diff --git a/convlab/dst/setsumbt/unified_format_data/__init__.py b/convlab/dst/setsumbt/unified_format_data/__init__.py
index 97fc12f6..3171d4b0 100644
--- a/convlab/dst/setsumbt/unified_format_data/__init__.py
+++ b/convlab/dst/setsumbt/unified_format_data/__init__.py
@@ -1,2 +1,2 @@
-from convlab2.dst.setsumbt.unified_format_data.dataset import unified_format, ontology
-from convlab2.dst.setsumbt.unified_format_data.Tracker import SetSUMBTTracker
\ No newline at end of file
+from convlab.dst.setsumbt.unified_format_data.dataset import unified_format, ontology
+from convlab.dst.setsumbt.unified_format_data.Tracker import SetSUMBTTracker
\ No newline at end of file
diff --git a/convlab/dst/setsumbt/unified_format_data/dataset/__init__.py b/convlab/dst/setsumbt/unified_format_data/dataset/__init__.py
index 1698ead5..e69de29b 100644
--- a/convlab/dst/setsumbt/unified_format_data/dataset/__init__.py
+++ b/convlab/dst/setsumbt/unified_format_data/dataset/__init__.py
@@ -1,12 +0,0 @@
-#!/usr/bin/env python3
-"""__init__.py.py:Description"""
-__author__  =   'Carel van Niekerk'
-__version__ =   '0.1'
-__date__    =   '29.06.22'
-
-# Load Packages
-
-
-if __name__ == '__main__':
-    #run
-
diff --git a/convlab/dst/setsumbt/unified_format_data/dataset/unified_format.py b/convlab/dst/setsumbt/unified_format_data/dataset/unified_format.py
index fb8e9acd..22c7a4b6 100644
--- a/convlab/dst/setsumbt/unified_format_data/dataset/unified_format.py
+++ b/convlab/dst/setsumbt/unified_format_data/dataset/unified_format.py
@@ -19,7 +19,7 @@ import torch
 from torch.utils.data import Dataset, DataLoader, RandomSampler, SequentialSampler
 from copy import deepcopy
 
-from convlab2.dst.setsumbt.unified_format_data.dataset.utils import (load_dataset, get_ontology_slots,
+from convlab.dst.setsumbt.unified_format_data.dataset.utils import (load_dataset, get_ontology_slots,
                                             ontology_add_values, get_values_from_data, ontology_add_requestable_slots,
                                             get_requestable_slots, load_dst_data, extract_dialogues)
 
diff --git a/convlab/dst/setsumbt/unified_format_data/dataset/utils.py b/convlab/dst/setsumbt/unified_format_data/dataset/utils.py
index e8abaad3..4124545d 100644
--- a/convlab/dst/setsumbt/unified_format_data/dataset/utils.py
+++ b/convlab/dst/setsumbt/unified_format_data/dataset/utils.py
@@ -15,7 +15,7 @@
 # limitations under the License.
 """Convlab3 Unified dataset data processing utilities"""
 
-from convlab2.util import load_dataset, load_ontology, load_dst_data, load_nlu_data
+from convlab.util import load_dataset, load_ontology, load_dst_data, load_nlu_data
 
 # MultiWOZ specific label map to avoid duplication and typos in values
 VALUE_MAP = {'guesthouse': 'guest house', 'belfry': 'belfray', '-': ' ', '&': 'and', 'b and b': 'bed and breakfast',
diff --git a/setup.py b/setup.py
index 6a51d8cc..ff64f1a9 100755
--- a/setup.py
+++ b/setup.py
@@ -29,7 +29,7 @@ setup(
         'tabulate',
         'python-Levenshtein',
         'requests',
-        'numpy>=1.22',
+        'numpy',
         'nltk',
         'scipy',
         'tensorboard',
-- 
GitLab