Updated gitignore

marius-team · Jan 20, 2024 · 2b8dac8 · 2b8dac8
1 parent c04d75a
commit 2b8dac8
Show file tree

Hide file tree

Showing 33 changed files with 64 additions and 864 deletions.
diff --git a/.gitignore b/.gitignore
@@ -171,3 +171,6 @@ Thumbs.db
 
 
 # End of https://www.toptal.com/developers/gitignore/api/python
+
+src/cpp/third_party
+test_datasets
diff --git a/docs/python_api/data/batch.rst b/docs/python_api/data/batch.rst
diff --git a/docs/python_api/data/dataloader.rst b/docs/python_api/data/dataloader.rst
diff --git a/docs/python_api/data/dense_graph.rst b/docs/python_api/data/dense_graph.rst
diff --git a/docs/python_api/data/graph.rst b/docs/python_api/data/graph.rst
diff --git a/docs/python_api/data/index.rst b/docs/python_api/data/index.rst
diff --git a/docs/python_api/data/samplers/edge.rst b/docs/python_api/data/samplers/edge.rst
diff --git a/docs/python_api/data/samplers/index.rst b/docs/python_api/data/samplers/index.rst
diff --git a/docs/python_api/data/samplers/negative.rst b/docs/python_api/data/samplers/negative.rst
diff --git a/docs/python_api/data/samplers/neighbor.rst b/docs/python_api/data/samplers/neighbor.rst
diff --git a/src/cpp/include/configuration/config.h b/src/cpp/include/configuration/config.h
@@ -143,6 +143,7 @@ struct TrainingConfig {
     int batch_size;
     shared_ptr<NegativeSamplingConfig> negative_sampling = nullptr;
     int num_epochs;
+    int batches_per_epoch; 
     shared_ptr<PipelineConfig> pipeline = nullptr;
     int epochs_per_shuffle;
     int logs_per_epoch;
@@ -157,6 +158,7 @@ struct EvaluationConfig {
     shared_ptr<NegativeSamplingConfig> negative_sampling = nullptr;
     shared_ptr<PipelineConfig> pipeline = nullptr;
     int epochs_per_eval;
+    int batches_per_epoch; 
     string checkpoint_dir;
     bool full_graph_evaluation;
 };
@@ -210,4 +212,4 @@ PYBIND11_EXPORT shared_ptr<MariusConfig> initMariusConfig(pyobj python_config);
 
 shared_ptr<MariusConfig> loadConfig(string config_path, bool save = false);
 
-#endif  // MARIUS_CONFIG_H
+#endif  // MARIUS_CONFIG_H
diff --git a/src/cpp/include/data/dataloader.h b/src/cpp/include/data/dataloader.h
@@ -86,7 +86,7 @@ class DataLoader {
 
     void setActiveNodes();
 
-    void initializeBatches(bool prepare_encode = false);
+    void initializeBatches(bool prepare_encode = false, bool in_training_mode = true);
 
     void clearBatches();
 

diff --git a/src/cpp/include/storage/graph_storage.h b/src/cpp/include/storage/graph_storage.h
@@ -11,9 +11,11 @@
 
 struct GraphModelStoragePtrs {
     shared_ptr<Storage> edges = nullptr;
+    shared_ptr<Storage> edges_weights = nullptr;
     shared_ptr<Storage> train_edges = nullptr;
-    shared_ptr<Storage> train_edges_dst_sort = nullptr;
     shared_ptr<Storage> train_edges_weights = nullptr;
+    shared_ptr<Storage> train_edges_dst_sort = nullptr;
+    shared_ptr<Storage> train_edges_dst_sort_weights = nullptr;
     shared_ptr<Storage> validation_edges = nullptr;
     shared_ptr<Storage> validation_edges_weights = nullptr;
     shared_ptr<Storage> test_edges = nullptr;
@@ -311,4 +313,4 @@ class GraphModelStorage {
     void addFilterEdges(shared_ptr<Storage> filter_edges) { storage_ptrs_.filter_edges.emplace_back(filter_edges); }
 };
 
-#endif  // MARIUS_SRC_CPP_INCLUDE_GRAPH_STORAGE_H_
+#endif  // MARIUS_SRC_CPP_INCLUDE_GRAPH_STORAGE_H_
diff --git a/src/cpp/python_bindings/data/batch_wrap.cpp b/src/cpp/python_bindings/data/batch_wrap.cpp
Original file line number	Diff line number	Diff line change
Expand Up		@@ -171,3 +171,6 @@ Thumbs.db


		# End of https://www.toptal.com/developers/gitignore/api/python

		src/cpp/third_party
		test_datasets