Add pip packacke support

LetsData-net · Dec 8, 2021 · 6054fd1 · 6054fd1
1 parent 24d2d34
commit 6054fd1
Show file tree

Hide file tree

Showing 112 changed files with 314 additions and 214 deletions.
diff --git a/.idea/NewsMTSC.iml b/.idea/NewsMTSC.iml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/__init__.py → DeepNewsSentiment/.gitignore b/__init__.py → DeepNewsSentiment/.gitignore
diff --git a/DatasetPreparer.py → DeepNewsSentiment/DatasetPreparer.py b/DatasetPreparer.py → DeepNewsSentiment/DatasetPreparer.py
@@ -13,8 +13,8 @@
 import jsonlines
 from tabulate import tabulate
 
-from SentimentClasses import SentimentClasses
-from fxlogger import get_logger
+from DeepNewsSentiment.SentimentClasses import SentimentClasses
+from DeepNewsSentiment.fxlogger import get_logger
 
 
 class DatasetPreparer:

diff --git a/knowledge/__init__.py → DeepNewsSentiment/LICENSE b/knowledge/__init__.py → DeepNewsSentiment/LICENSE
diff --git a/losses/__init__.py → DeepNewsSentiment/README.md b/losses/__init__.py → DeepNewsSentiment/README.md
diff --git a/SentimentClasses.py → DeepNewsSentiment/SentimentClasses.py b/SentimentClasses.py → DeepNewsSentiment/SentimentClasses.py
diff --git a/models/__init__.py → DeepNewsSentiment/__init__.py b/models/__init__.py → DeepNewsSentiment/__init__.py
diff --git a/DeepNewsSentiment/__main__.py b/DeepNewsSentiment/__main__.py
@@ -0,0 +1,17 @@
+import argparse
+
+from DeepNewsSentiment.download import Download
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(prog='DeepNewsAnalysis')
+    subparsers = parser.add_subparsers(dest='action')
+
+    subparser_download = subparsers.add_parser('download', help=Download.add_subparser.__doc__)
+    Download.add_subparser(subparser_download)
+
+    args = parser.parse_args()
+    action = args.action
+    del args.action
+
+    if action == 'download':
+        Download.run_from_parser(args)
diff --git a/combinations_default.py → DeepNewsSentiment/combinations_default.py b/combinations_default.py → DeepNewsSentiment/combinations_default.py
@@ -1,4 +1,4 @@
-from consts import BERT_BASE_UNCASED
+from DeepNewsSentiment.consts import BERT_BASE_UNCASED
 
 combinations_default_0 = {
     "own_model_name": [

diff --git a/consts.py → DeepNewsSentiment/consts.py b/consts.py → DeepNewsSentiment/consts.py
diff --git a/controller.py → DeepNewsSentiment/controller.py b/controller.py → DeepNewsSentiment/controller.py
@@ -32,24 +32,24 @@
 from tabulate import tabulate
 from tqdm import tqdm
 
-from combinations_ensemble import combinations_ensemble
-from combinations_final_lcf2 import combinations_final_lcf2
-from combinations_final_nostance import combinations_final_nostance
-from combinations_final_spc import combinations_final_spc
-from combinations_final_stance0 import combinations_final_stance0
-from combinations_final_stance1 import combinations_final_stance1
-from combinations_final_tdbert import combinations_final_tdbert
-from combinations_top import combinations_top
-from DatasetPreparer import DatasetPreparer
-from combinations_default import combinations_default_0
-from combinations_top4otherdomains import combinations_top4otherdomains
-from combinations_top_coref16 import combinations_top_coref16
-from combinations_top_coref8 import combinations_top_coref8
-from combinations_top_coref8_stanceno import combinations_top_coref8_stanceno
-from combinations_top_finetuned import combinations_top_finetuned
-from diskdict import DiskDict
-from fxlogger import get_logger
-from train import str2bool
+from DeepNewsSentiment.combinations_ensemble import combinations_ensemble
+from DeepNewsSentiment.combinations_final_lcf2 import combinations_final_lcf2
+from DeepNewsSentiment.combinations_final_nostance import combinations_final_nostance
+from DeepNewsSentiment.combinations_final_spc import combinations_final_spc
+from DeepNewsSentiment.combinations_final_stance0 import combinations_final_stance0
+from DeepNewsSentiment.combinations_final_stance1 import combinations_final_stance1
+from DeepNewsSentiment.combinations_final_tdbert import combinations_final_tdbert
+from DeepNewsSentiment.combinations_top import combinations_top
+from DeepNewsSentiment.DatasetPreparer import DatasetPreparer
+from DeepNewsSentiment.combinations_default import combinations_default_0
+from DeepNewsSentiment.combinations_top4otherdomains import combinations_top4otherdomains
+from DeepNewsSentiment.combinations_top_coref16 import combinations_top_coref16
+from DeepNewsSentiment.combinations_top_coref8 import combinations_top_coref8
+from DeepNewsSentiment.combinations_top_coref8_stanceno import combinations_top_coref8_stanceno
+from DeepNewsSentiment.combinations_top_finetuned import combinations_top_finetuned
+from DeepNewsSentiment.diskdict import DiskDict
+from DeepNewsSentiment.fxlogger import get_logger
+from DeepNewsSentiment.train import str2bool
 
 completed_tasks = None  # will be DiskDict later
 completed_tasks_in_this_run_count = 0

diff --git a/...ets/NewsMTSC-dataset/NewsMTSC-dataset.zip → ...ets/NewsMTSC-dataset/NewsMTSC-dataset.zip b/...ets/NewsMTSC-dataset/NewsMTSC-dataset.zip → ...ets/NewsMTSC-dataset/NewsMTSC-dataset.zip
diff --git a/...ts/NewsMTSC-dataset/NewsMTSC-preprint.pdf → ...ts/NewsMTSC-dataset/NewsMTSC-preprint.pdf b/...ts/NewsMTSC-dataset/NewsMTSC-preprint.pdf → ...ts/NewsMTSC-dataset/NewsMTSC-preprint.pdf
diff --git a/...atasets/NewsMTSC-dataset/devtest_mt.jsonl → ...atasets/NewsMTSC-dataset/devtest_mt.jsonl b/...atasets/NewsMTSC-dataset/devtest_mt.jsonl → ...atasets/NewsMTSC-dataset/devtest_mt.jsonl
diff --git a/...atasets/NewsMTSC-dataset/devtest_rw.jsonl → ...atasets/NewsMTSC-dataset/devtest_rw.jsonl b/...atasets/NewsMTSC-dataset/devtest_rw.jsonl → ...atasets/NewsMTSC-dataset/devtest_rw.jsonl
diff --git a/..._data/datasets/NewsMTSC-dataset/readme.md → ..._data/datasets/NewsMTSC-dataset/readme.md b/..._data/datasets/NewsMTSC-dataset/readme.md → ..._data/datasets/NewsMTSC-dataset/readme.md
diff --git a/...ata/datasets/NewsMTSC-dataset/train.jsonl → ...ata/datasets/NewsMTSC-dataset/train.jsonl b/...ata/datasets/NewsMTSC-dataset/train.jsonl → ...ata/datasets/NewsMTSC-dataset/train.jsonl
diff --git a/...data/datasets/acl14twitter/test.raw.jsonl → ...data/datasets/acl14twitter/test.raw.jsonl b/...data/datasets/acl14twitter/test.raw.jsonl → ...data/datasets/acl14twitter/test.raw.jsonl
diff --git a/...ata/datasets/acl14twitter/train.raw.jsonl → ...ata/datasets/acl14twitter/train.raw.jsonl b/...ata/datasets/acl14twitter/train.raw.jsonl → ...ata/datasets/acl14twitter/train.raw.jsonl
diff --git a/...train-and-test-mt/devtest_mtsc_only.jsonl → ...train-and-test-mt/devtest_mtsc_only.jsonl b/...train-and-test-mt/devtest_mtsc_only.jsonl → ...train-and-test-mt/devtest_mtsc_only.jsonl
diff --git a/...ts/newsmtsc-train-and-test-mt/train.jsonl → ...ts/newsmtsc-train-and-test-mt/train.jsonl b/...ts/newsmtsc-train-and-test-mt/train.jsonl → ...ts/newsmtsc-train-and-test-mt/train.jsonl
diff --git a/...w/devtest_mtsc_and_single_primaries.jsonl → ...w/devtest_mtsc_and_single_primaries.jsonl b/...w/devtest_mtsc_and_single_primaries.jsonl → ...w/devtest_mtsc_and_single_primaries.jsonl
diff --git a/...ts/newsmtsc-train-and-test-rw/train.jsonl → ...ts/newsmtsc-train-and-test-rw/train.jsonl b/...ts/newsmtsc-train-and-test-rw/train.jsonl → ...ts/newsmtsc-train-and-test-rw/train.jsonl
diff --git a/...14laptops/Laptops_Test_Gold.xml.seg.jsonl → ...14laptops/Laptops_Test_Gold.xml.seg.jsonl b/...14laptops/Laptops_Test_Gold.xml.seg.jsonl → ...14laptops/Laptops_Test_Gold.xml.seg.jsonl
diff --git a/...eval14laptops/Laptops_Train.xml.seg.jsonl → ...eval14laptops/Laptops_Train.xml.seg.jsonl b/...eval14laptops/Laptops_Train.xml.seg.jsonl → ...eval14laptops/Laptops_Train.xml.seg.jsonl
diff --git a/...rants/Restaurants_Test_Gold.xml.seg.jsonl → ...rants/Restaurants_Test_Gold.xml.seg.jsonl b/...rants/Restaurants_Test_Gold.xml.seg.jsonl → ...rants/Restaurants_Test_Gold.xml.seg.jsonl
diff --git a/...staurants/Restaurants_Train.xml.seg.jsonl → ...staurants/Restaurants_Train.xml.seg.jsonl b/...staurants/Restaurants_Train.xml.seg.jsonl → ...staurants/Restaurants_Train.xml.seg.jsonl
diff --git a/createoverview.py → DeepNewsSentiment/createoverview.py b/createoverview.py → DeepNewsSentiment/createoverview.py
@@ -7,7 +7,7 @@
 import jsonlines
 import pandas as pd
 
-from fxlogger import get_logger
+from DeepNewsSentiment.fxlogger import get_logger
 
 logger = get_logger()
 

diff --git a/customexceptions.py → DeepNewsSentiment/customexceptions.py b/customexceptions.py → DeepNewsSentiment/customexceptions.py
diff --git a/dataset.py → DeepNewsSentiment/dataset.py b/dataset.py → DeepNewsSentiment/dataset.py
@@ -17,26 +17,26 @@
     AlbertTokenizer,
 )
 
-from SentimentClasses import SentimentClasses
-from customexceptions import TooLongTextException, TargetNotFoundException
-from consts import *
-from fxlogger import get_logger
+from DeepNewsSentiment.SentimentClasses import SentimentClasses
+from DeepNewsSentiment.customexceptions import TooLongTextException, TargetNotFoundException
+from DeepNewsSentiment.consts import *
+from DeepNewsSentiment.fxlogger import get_logger
 
 # get logger
-from knowledge.bingliuopinion.bingliuopinion import (
+from DeepNewsSentiment.knowledge.bingliuopinion.bingliuopinion import (
     get_bingliu_polarities_as_tensor,
     get_num_bingliu_polarities,
 )
-from knowledge.mpqasubjectivity.mpqasubjectivity import (
+from DeepNewsSentiment.knowledge.mpqasubjectivity.mpqasubjectivity import (
     get_mpqa_subjectivity_polarities_as_tensor,
     get_num_mpqa_subjectivity_polarities,
 )
-from knowledge.nrcemolex.nrcemolex import (
+from DeepNewsSentiment.knowledge.nrcemolex.nrcemolex import (
     get_nrc_emotions_as_tensor,
     get_num_nrc_emotions,
 )
-from knowledge.zeros.zerosknowledge import get_num_zero_dimensions, get_zeros_as_tensor
-from models.FXBaseModel import FXBaseModel
+from DeepNewsSentiment.knowledge.zeros.zerosknowledge import get_num_zero_dimensions, get_zeros_as_tensor
+from DeepNewsSentiment.models.FXBaseModel import FXBaseModel
 
 logger = get_logger()
 nlp = spacy.load("en_core_web_sm")

diff --git a/diskdict.py → DeepNewsSentiment/diskdict.py b/diskdict.py → DeepNewsSentiment/diskdict.py
@@ -2,10 +2,11 @@
 import pickle
 from typing import Union
 
-from fxlogger import get_logger
+from DeepNewsSentiment.fxlogger import get_logger
 
 logger = get_logger()
 
+
 class DiskDict(dict):
     def __init__(self, sync_path: Union[Path, str]):
         if type(sync_path) == str:

diff --git a/download.py → DeepNewsSentiment/download.py b/download.py → DeepNewsSentiment/download.py
@@ -8,7 +8,7 @@
 
 import torch
 
-from fxlogger import get_logger
+from DeepNewsSentiment.fxlogger import get_logger
 
 
 class Download:
@@ -19,8 +19,8 @@ class Download:
     def __init__(
         self, own_model_name, version="default", force=False, list_versions=False
     ):
-        from models.FXBaseModel import model_includes_pretrained
-        from train import OWN_MODELNAME2CLASS
+        from DeepNewsSentiment.models.FXBaseModel import model_includes_pretrained
+        from DeepNewsSentiment.train import OWN_MODELNAME2CLASS
 
         logger = get_logger()
         own_model_name = own_model_name
@@ -62,6 +62,7 @@ def download(cls, model_cls, version=None, force=False):
             print("Model file already exists. Use --force to overwrite.")
             exit(2)
         print(f"Downloading to {path}:")
+        os.makedirs(os.path.dirname(path), exist_ok=True)
         torch.hub.download_url_to_file(source, path)
 
     @staticmethod
@@ -78,37 +79,29 @@ def model_path(cls, model_cls, version=None):
         return os.path.join(cls.MODEL_DIRECTORY, cls.model_filename(model_cls, version))
 
     @staticmethod
-    def argument_parser():
-        parser = argparse.ArgumentParser()
-        parser.add_argument("--own_model_name", default="grutsc", type=str)
-        parser.add_argument(
+    def add_subparser(subparser):
+        """Download models for DeepNewsSentiment"""
+        subparser.add_argument("--own_model_name", default="grutsc", type=str)
+        subparser.add_argument(
             "--version",
             default=None,
             type=str,
             help="version of the model to download, use --force to overwrite a version which was already downloaded",
         )
-        parser.add_argument(
+        subparser.add_argument(
             "--force",
             action="store_true",
             help="force the download of a model and overwrite potential previous versions",
         )
-        parser.add_argument(
+        subparser.add_argument(
             "--list_versions",
             action="store_true",
             help="List all pretrained model versions which a model provides",
         )
-        return parser
+        return subparser
 
     @classmethod
-    def run_from_cmd(cls):
-        args = vars(cls.argument_parser().parse_args())
+    def run_from_parser(cls, args_namespace):
+        args = vars(args_namespace)
         return cls(**args)
 
-    @classmethod
-    def run_defaults(cls):
-        args = vars(cls.argument_parser().parse_args([]))
-        return cls(**args)
-
-
-if __name__ == "__main__":
-    Download.run_from_cmd()
diff --git a/earlystopping.py → DeepNewsSentiment/earlystopping.py b/earlystopping.py → DeepNewsSentiment/earlystopping.py
@@ -2,7 +2,7 @@
 # Copyright by Bjarten
 # License: MIT
 
-from fxlogger import get_logger
+from DeepNewsSentiment.fxlogger import get_logger
 
 
 class EarlyStopping:

diff --git a/evaluator.py → DeepNewsSentiment/evaluator.py b/evaluator.py → DeepNewsSentiment/evaluator.py
@@ -5,9 +5,9 @@
 import numpy as np
 from sklearn import metrics
 
-from SentimentClasses import SentimentClasses
-from dataset import FXDataset
-from fxlogger import get_logger
+from DeepNewsSentiment.SentimentClasses import SentimentClasses
+from DeepNewsSentiment.dataset import FXDataset
+from DeepNewsSentiment.fxlogger import get_logger
 
 
 class Evaluator:

diff --git a/...ts/default/datasets/newsmtsc-mt/dev.jsonl → ...ts/default/datasets/newsmtsc-mt/dev.jsonl b/...ts/default/datasets/newsmtsc-mt/dev.jsonl → ...ts/default/datasets/newsmtsc-mt/dev.jsonl
diff --git a/...s/default/datasets/newsmtsc-mt/test.jsonl → ...s/default/datasets/newsmtsc-mt/test.jsonl b/...s/default/datasets/newsmtsc-mt/test.jsonl → ...s/default/datasets/newsmtsc-mt/test.jsonl
diff --git a/.../default/datasets/newsmtsc-mt/train.jsonl → .../default/datasets/newsmtsc-mt/train.jsonl b/.../default/datasets/newsmtsc-mt/train.jsonl → .../default/datasets/newsmtsc-mt/train.jsonl
diff --git a/...ts/default/datasets/newsmtsc-rw/dev.jsonl → ...ts/default/datasets/newsmtsc-rw/dev.jsonl b/...ts/default/datasets/newsmtsc-rw/dev.jsonl → ...ts/default/datasets/newsmtsc-rw/dev.jsonl
diff --git a/...s/default/datasets/newsmtsc-rw/test.jsonl → ...s/default/datasets/newsmtsc-rw/test.jsonl b/...s/default/datasets/newsmtsc-rw/test.jsonl → ...s/default/datasets/newsmtsc-rw/test.jsonl
diff --git a/.../default/datasets/newsmtsc-rw/train.jsonl → .../default/datasets/newsmtsc-rw/train.jsonl b/.../default/datasets/newsmtsc-rw/train.jsonl → .../default/datasets/newsmtsc-rw/train.jsonl
diff --git a/fxlogger.py → DeepNewsSentiment/fxlogger.py b/fxlogger.py → DeepNewsSentiment/fxlogger.py
@@ -13,8 +13,9 @@ def get_logger():
         handler = logging.StreamHandler()
         handler.setFormatter(formatter)
 
-        logger = logging.getLogger("root")
-        logger.setLevel(logging.INFO)
+        logger = logging.getLogger("DeepNewsSentiment")
+        if logger.level == logging.NOTSET:
+            logger.setLevel(logging.INFO)
 
         if len(logger.handlers) == 0:
             logger.addHandler(handler)

diff --git a/DeepNewsSentiment/hubconf.py b/DeepNewsSentiment/hubconf.py
@@ -0,0 +1 @@
+from DeepNewsSentiment.models.singletarget.grutscsingle import GRUTSCSingle
diff --git a/infer.py → DeepNewsSentiment/infer.py b/infer.py → DeepNewsSentiment/infer.py
@@ -5,12 +5,12 @@
 from jsonlines import jsonlines
 from tqdm import tqdm
 
-from SentimentClasses import SentimentClasses
-from dataset import FXEasyTokenizer
-from download import Download
-from fxlogger import get_logger
-from models.singletarget.grutscsingle import GRUTSCSingle
-from train import (
+from DeepNewsSentiment.SentimentClasses import SentimentClasses
+from DeepNewsSentiment.dataset import FXEasyTokenizer
+from DeepNewsSentiment.download import Download
+from DeepNewsSentiment.fxlogger import get_logger
+from DeepNewsSentiment.models.singletarget.grutscsingle import GRUTSCSingle
+from DeepNewsSentiment.train import (
     parse_arguments as parse_arguments_from_train,
     prepare_and_start_instructor,
 )

diff --git a/models/multitargets/__init__.py → DeepNewsSentiment/knowledge/__init__.py b/models/multitargets/__init__.py → DeepNewsSentiment/knowledge/__init__.py
diff --git a/knowledge/bingliuopinion/bingliuopinion.py → ...nowledge/bingliuopinion/bingliuopinion.py b/knowledge/bingliuopinion/bingliuopinion.py → ...nowledge/bingliuopinion/bingliuopinion.py
@@ -1,8 +1,8 @@
-from diskdict import DiskDict
 import torch
 
-from knowledge.bingliuopinion.converter import PATH_DICT_BING_LIU_OPINION_POLARITY, POLARITY2INDEX
-from knowledge.knowledgeutils import find_key_original_or_lc
+from DeepNewsSentiment.diskdict import DiskDict
+from DeepNewsSentiment.knowledge.bingliuopinion.converter import PATH_DICT_BING_LIU_OPINION_POLARITY, POLARITY2INDEX
+from DeepNewsSentiment.knowledge.knowledgeutils import find_key_original_or_lc
 
 __ddict_emolex = DiskDict(PATH_DICT_BING_LIU_OPINION_POLARITY)
 __ddict_emolex_keys_lower = {k.lower(): v for k, v in __ddict_emolex.items()}

diff --git a/knowledge/bingliuopinion/converter.py → ...ent/knowledge/bingliuopinion/converter.py b/knowledge/bingliuopinion/converter.py → ...ent/knowledge/bingliuopinion/converter.py
@@ -1,19 +1,19 @@
 from collections import defaultdict, Counter
 from pathlib import Path
 import csv
+import os
 
 from tqdm import tqdm
 
-from fxlogger import get_logger
-from diskdict import DiskDict
+from DeepNewsSentiment.fxlogger import get_logger
+from DeepNewsSentiment.diskdict import DiskDict
 
 POLARITY2INDEX = {
     "positive": 1,
     "negative": 0,
 }
-PATH_DICT_BING_LIU_OPINION_POLARITY = Path(
-    "knowledge/bingliuopinion/opinion_polarity.ddict"
-)
+THIS_DIR = Path(os.path.dirname(os.path.realpath(__file__)))
+PATH_DICT_BING_LIU_OPINION_POLARITY = THIS_DIR / "opinion_polarity.ddict"
 
 logger = get_logger()
 
@@ -30,9 +30,8 @@ def convert_single_txt_to_dict(path: Path):
 
 
 def convert_txt_to_dict():
-    path_dict = Path("knowledge/bingliuopinion/")
-    path_pos = path_dict / "positive-words.txt"
-    path_neg = path_dict / "negative-words.txt"
+    path_pos = THIS_DIR / "positive-words.txt"
+    path_neg = THIS_DIR / "negative-words.txt"
 
     term2polarity = defaultdict(set)
     polarity_counter = Counter()

diff --git a/knowledge/bingliuopinion/license.txt → ...ment/knowledge/bingliuopinion/license.txt b/knowledge/bingliuopinion/license.txt → ...ment/knowledge/bingliuopinion/license.txt
diff --git a/knowledge/bingliuopinion/negative-words.txt → ...owledge/bingliuopinion/negative-words.txt b/knowledge/bingliuopinion/negative-words.txt → ...owledge/bingliuopinion/negative-words.txt
diff --git a/...dge/bingliuopinion/opinion_polarity.ddict → ...dge/bingliuopinion/opinion_polarity.ddict b/...dge/bingliuopinion/opinion_polarity.ddict → ...dge/bingliuopinion/opinion_polarity.ddict
diff --git a/knowledge/bingliuopinion/positive-words.txt → ...owledge/bingliuopinion/positive-words.txt b/knowledge/bingliuopinion/positive-words.txt → ...owledge/bingliuopinion/positive-words.txt
diff --git a/knowledge/knowledgeutils.py → ...NewsSentiment/knowledge/knowledgeutils.py b/knowledge/knowledgeutils.py → ...NewsSentiment/knowledge/knowledgeutils.py
diff --git a/knowledge/liwc/data/.gitignore → ...sSentiment/knowledge/liwc/data/.gitignore b/knowledge/liwc/data/.gitignore → ...sSentiment/knowledge/liwc/data/.gitignore
diff --git a/knowledge/liwc/data/readme.txt → ...sSentiment/knowledge/liwc/data/readme.txt b/knowledge/liwc/data/readme.txt → ...sSentiment/knowledge/liwc/data/readme.txt
diff --git a/knowledge/liwc/dic.py → DeepNewsSentiment/knowledge/liwc/dic.py b/knowledge/liwc/dic.py → DeepNewsSentiment/knowledge/liwc/dic.py
diff --git a/knowledge/liwc/liwc.py → DeepNewsSentiment/knowledge/liwc/liwc.py b/knowledge/liwc/liwc.py → DeepNewsSentiment/knowledge/liwc/liwc.py
@@ -1,6 +1,6 @@
 import torch
 
-from knowledge.liwc.liwchelper import load_token_parser
+from DeepNewsSentiment.knowledge.liwc.liwchelper import load_token_parser
 
 parse, category_names = load_token_parser()
 

diff --git a/knowledge/liwc/liwchelper.py → ...ewsSentiment/knowledge/liwc/liwchelper.py b/knowledge/liwc/liwchelper.py → ...ewsSentiment/knowledge/liwc/liwchelper.py
diff --git a/knowledge/liwc/trie.py → DeepNewsSentiment/knowledge/liwc/trie.py b/knowledge/liwc/trie.py → DeepNewsSentiment/knowledge/liwc/trie.py
diff --git a/knowledge/mpqasubjectivity/converter.py → ...t/knowledge/mpqasubjectivity/converter.py b/knowledge/mpqasubjectivity/converter.py → ...t/knowledge/mpqasubjectivity/converter.py
@@ -1,20 +1,20 @@
+import os
 from collections import defaultdict, Counter
 from pathlib import Path
 import csv
 
 from tqdm import tqdm
 
-from fxlogger import get_logger
-from diskdict import DiskDict
+from DeepNewsSentiment.fxlogger import get_logger
+from DeepNewsSentiment.diskdict import DiskDict
 
 POLARITY2INDEX = {
     "positive": 2,
     "neutral": 1,
     "negative": 0,
 }
-PATH_DICT_MPQA_SUBJECTIVITY = Path(
-    "knowledge/mpqasubjectivity/subjclueslen1-HLTEMNLP05.tff.ddict"
-)
+THIS_DIR = Path(os.path.dirname(os.path.realpath(__file__)))
+PATH_DICT_MPQA_SUBJECTIVITY = THIS_DIR / "subjclueslen1-HLTEMNLP05.tff.ddict"
 
 logger = get_logger()
 
@@ -24,7 +24,7 @@ def get_value(entry_key_value: str):
 
 
 def convert_txt_to_dict():
-    path_dict = Path("knowledge/mpqasubjectivity/subjclueslen1-HLTEMNLP05.tff")
+    path_dict = THIS_DIR / "subjclueslen1-HLTEMNLP05.tff"
 
     term2polarity = defaultdict(set)
     polarity_counter = Counter()

diff --git a/...edge/mpqasubjectivity/mpqasubjectivity.py → ...edge/mpqasubjectivity/mpqasubjectivity.py b/...edge/mpqasubjectivity/mpqasubjectivity.py → ...edge/mpqasubjectivity/mpqasubjectivity.py
@@ -1,8 +1,8 @@
-from diskdict import DiskDict
 import torch
 
-from knowledge.knowledgeutils import find_key_original_or_lc
-from knowledge.mpqasubjectivity.converter import POLARITY2INDEX, PATH_DICT_MPQA_SUBJECTIVITY
+from DeepNewsSentiment.diskdict import DiskDict
+from DeepNewsSentiment.knowledge.knowledgeutils import find_key_original_or_lc
+from DeepNewsSentiment.knowledge.mpqasubjectivity.converter import POLARITY2INDEX, PATH_DICT_MPQA_SUBJECTIVITY
 
 __ddict_emolex = DiskDict(PATH_DICT_MPQA_SUBJECTIVITY)
 __ddict_emolex_keys_lower = {k.lower(): v for k, v in __ddict_emolex.items()}

diff --git a/...subjectivity/subjclueslen1-HLTEMNLP05.tff → ...subjectivity/subjclueslen1-HLTEMNLP05.tff b/...subjectivity/subjclueslen1-HLTEMNLP05.tff → ...subjectivity/subjclueslen1-HLTEMNLP05.tff
diff --git a/...tivity/subjclueslen1-HLTEMNLP05.tff.ddict → ...tivity/subjclueslen1-HLTEMNLP05.tff.ddict b/...tivity/subjclueslen1-HLTEMNLP05.tff.ddict → ...tivity/subjclueslen1-HLTEMNLP05.tff.ddict
diff --git a/...x/NRC-Emotion-Lexicon-Wordlevel-v0.92.txt → ...x/NRC-Emotion-Lexicon-Wordlevel-v0.92.txt b/...x/NRC-Emotion-Lexicon-Wordlevel-v0.92.txt → ...x/NRC-Emotion-Lexicon-Wordlevel-v0.92.txt
diff --git a/...Emotion-Lexicon-Wordlevel-v0.92.txt.ddict → ...Emotion-Lexicon-Wordlevel-v0.92.txt.ddict b/...Emotion-Lexicon-Wordlevel-v0.92.txt.ddict → ...Emotion-Lexicon-Wordlevel-v0.92.txt.ddict
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		from DeepNewsSentiment.models.singletarget.grutscsingle import GRUTSCSingle