Jan Mühlnikel
commited on
Commit
·
1910714
1
Parent(s):
4226dcf
rmv sector
Browse files- app.py +2 -1
- sector.py +5 -2
- similarity.py +7 -2
app.py
CHANGED
|
@@ -16,7 +16,8 @@ navbar = show_navbar()
|
|
| 16 |
if navbar == "Home":
|
| 17 |
st.session_state.page = home.show_page()
|
| 18 |
elif navbar == "Sector Matches":
|
| 19 |
-
|
|
|
|
| 20 |
elif navbar == "Similarity Matches":
|
| 21 |
st.session_state.page = similarity.show_page()
|
| 22 |
|
|
|
|
| 16 |
if navbar == "Home":
|
| 17 |
st.session_state.page = home.show_page()
|
| 18 |
elif navbar == "Sector Matches":
|
| 19 |
+
pass
|
| 20 |
+
#st.session_state.page = sector.show_page()
|
| 21 |
elif navbar == "Similarity Matches":
|
| 22 |
st.session_state.page = similarity.show_page()
|
| 23 |
|
sector.py
CHANGED
|
@@ -10,7 +10,7 @@ import pandas as pd
|
|
| 10 |
import utils.crs_table as crs_table
|
| 11 |
import utils.sdg_table as sdg_table
|
| 12 |
import utils.filter_modules as filter_modules
|
| 13 |
-
|
| 14 |
from importlib.machinery import SourceFileLoader
|
| 15 |
crs_overlap = SourceFileLoader("crs_overlap", "data/models/crs_overlap.py").load_module()
|
| 16 |
sdg_overlap = SourceFileLoader("sdg_overlap", "data/models/sdg_overlap.py").load_module()
|
|
@@ -68,12 +68,13 @@ SHOW_ALL_COUNTRIES = False # If all countries should be showed in matching
|
|
| 68 |
## ORGANIZATION
|
| 69 |
SPECIAL_ORGA_SLECTIONS = ["All"]
|
| 70 |
SHOW_ALL_ORGAS = False
|
| 71 |
-
|
| 72 |
########
|
| 73 |
# PAGE #
|
| 74 |
########
|
| 75 |
def show_page():
|
| 76 |
|
|
|
|
| 77 |
def show_crs():
|
| 78 |
# SESSION STATES
|
| 79 |
st.session_state.crs5_option_disabled = True
|
|
@@ -219,4 +220,6 @@ def show_page():
|
|
| 219 |
show_crs()
|
| 220 |
elif match_option == "SDG":
|
| 221 |
show_sdg()
|
|
|
|
|
|
|
| 222 |
|
|
|
|
| 10 |
import utils.crs_table as crs_table
|
| 11 |
import utils.sdg_table as sdg_table
|
| 12 |
import utils.filter_modules as filter_modules
|
| 13 |
+
"""
|
| 14 |
from importlib.machinery import SourceFileLoader
|
| 15 |
crs_overlap = SourceFileLoader("crs_overlap", "data/models/crs_overlap.py").load_module()
|
| 16 |
sdg_overlap = SourceFileLoader("sdg_overlap", "data/models/sdg_overlap.py").load_module()
|
|
|
|
| 68 |
## ORGANIZATION
|
| 69 |
SPECIAL_ORGA_SLECTIONS = ["All"]
|
| 70 |
SHOW_ALL_ORGAS = False
|
| 71 |
+
"""
|
| 72 |
########
|
| 73 |
# PAGE #
|
| 74 |
########
|
| 75 |
def show_page():
|
| 76 |
|
| 77 |
+
"""
|
| 78 |
def show_crs():
|
| 79 |
# SESSION STATES
|
| 80 |
st.session_state.crs5_option_disabled = True
|
|
|
|
| 220 |
show_crs()
|
| 221 |
elif match_option == "SDG":
|
| 222 |
show_sdg()
|
| 223 |
+
|
| 224 |
+
"""
|
| 225 |
|
similarity.py
CHANGED
|
@@ -9,6 +9,12 @@ import streamlit as st
|
|
| 9 |
import pandas as pd
|
| 10 |
from scipy.sparse import load_npz
|
| 11 |
import utils.similarity_table as similarity_table
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 12 |
|
| 13 |
# Catch DATA
|
| 14 |
# Load Similarity matrix
|
|
@@ -17,10 +23,8 @@ def load_sim_matrix():
|
|
| 17 |
loaded_matrix = load_npz("app/src/similarities.npz")
|
| 18 |
dense_matrix = loaded_matrix.toarray()
|
| 19 |
|
| 20 |
-
|
| 21 |
return dense_matrix
|
| 22 |
|
| 23 |
-
|
| 24 |
@st.cache_data
|
| 25 |
def load_projects():
|
| 26 |
orgas_df = pd.read_csv("app/src/projects/project_orgas.csv")
|
|
@@ -41,6 +45,7 @@ sim_matrix = load_sim_matrix()
|
|
| 41 |
projects_df = load_projects()
|
| 42 |
|
| 43 |
def show_page():
|
|
|
|
| 44 |
st.write("Similarities")
|
| 45 |
|
| 46 |
df_subset = projects_df.head(10)
|
|
|
|
| 9 |
import pandas as pd
|
| 10 |
from scipy.sparse import load_npz
|
| 11 |
import utils.similarity_table as similarity_table
|
| 12 |
+
import psutil
|
| 13 |
+
import os
|
| 14 |
+
|
| 15 |
+
def get_process_memory():
|
| 16 |
+
process = psutil.Process(os.getpid())
|
| 17 |
+
return process.memory_info().rss / (1024 * 1024)
|
| 18 |
|
| 19 |
# Catch DATA
|
| 20 |
# Load Similarity matrix
|
|
|
|
| 23 |
loaded_matrix = load_npz("app/src/similarities.npz")
|
| 24 |
dense_matrix = loaded_matrix.toarray()
|
| 25 |
|
|
|
|
| 26 |
return dense_matrix
|
| 27 |
|
|
|
|
| 28 |
@st.cache_data
|
| 29 |
def load_projects():
|
| 30 |
orgas_df = pd.read_csv("app/src/projects/project_orgas.csv")
|
|
|
|
| 45 |
projects_df = load_projects()
|
| 46 |
|
| 47 |
def show_page():
|
| 48 |
+
st.write(f"Current RAM usage of this app: {get_process_memory():.2f} MB")
|
| 49 |
st.write("Similarities")
|
| 50 |
|
| 51 |
df_subset = projects_df.head(10)
|