Merge pull request #83 from marty1885/master

Fix! More fixes!!

Author: marty1885

Etaler/Algorithms/TemporalMemory.cpp

@@ -31,7 +31,7 @@ void TemporalMemory::learn(const Tensor& active_cells, const Tensor& last_active
 	Tensor learning_cells = reverseBurst(active_cells);
 
 	learnCorrilation(last_active, learning_cells, connections_, permanences_, permanence_inc_, permanence_dec_);
-	growSynapses(last_active, learning_cells, connections_, permanences_, 0.21);
+	growSynapses(last_active, learning_cells, connections_, permanences_, initial_permanence_);
 
 }
 

Etaler/Algorithms/TemporalMemory.hpp

@@ -31,7 +31,11 @@ struct ETALER_EXPORT TemporalMemory
 	void setActiveThreshold(size_t thr) { active_threshold_ = thr; }
 	size_t activeThreshold() const { return active_threshold_; }
 
-	size_t cellsPerColumn() const {return connections_.shape().back();}
+	size_t cellsPerColumn() const {return connections_.shape()[connections_.size()-2];}
+	size_t maxSynapsesPerCell() const {return connections_.shape().back();}
+
+	float initialPermanence() const {return initial_permanence_;}
+	void setInitialPermanence(float p) {initial_permanence_ = p;}
 
 	Tensor connections() const {return connections_;}
 	Tensor permanences() const {return permanences_;}
@@ -53,10 +57,11 @@ struct ETALER_EXPORT TemporalMemory
 	void loadState(const StateDict& states);
 
 	Shape input_shape_;
-	float connected_permanence_ = 0.1;
+	float connected_permanence_ = 0.15;
 	size_t active_threshold_ = 2;
 	float permanence_inc_ = 0.1;
 	float permanence_dec_ = 0.1;
+	float initial_permanence_ = 0.21;
 	Tensor connections_;
 	Tensor permanences_;
 };

Etaler/Backends/CPUBackend.cpp

@@ -164,7 +164,7 @@ void learnCorrilation(const TensorImpl* x, const TensorImpl* learn, const Tensor
 			else
 				perm -= perm_dec;
 
-			perm = std::max(std::min(perm, PermType(1)), PermType(0));
+			perm = std::clamp(perm, PermType(0), PermType(1));
 		}
 	});
 }

Etaler/Backends/OpenCLBackend.cpp

@@ -24,10 +24,10 @@ static std::string readAll(const std::string& path)
 	return str;
 }
 
-inline size_t selectWorkSize(size_t max, size_t mul_of, size_t size)
+inline intmax_t selectWorkSize(intmax_t max, intmax_t mul_of, intmax_t size)
 {
 	auto round = [mul_of](auto v){return ((v/mul_of)*mul_of) + (v%mul_of == 0 ? 0 : mul_of);};
-	return std::min((size_t)max, round(size));
+	return std::min((intmax_t)max, round(size));
 }
 
 
@@ -488,8 +488,8 @@ std::shared_ptr<TensorImpl> OpenCLBackend::reverseBurst(const TensorImpl* x)
 
 	auto res = copy(x);
 
-	size_t local_size = 128;
-	size_t global_size = selectWorkSize(4096, local_size, num_columns);
+	intmax_t local_size = 128;
+	intmax_t global_size = selectWorkSize(4096, local_size, num_columns);
 	std::vector<uint32_t> seed1(global_size);
 	std::vector<uint32_t> seed2(global_size);
 

Etaler/Core/Tensor.cpp

@@ -40,7 +40,7 @@ static size_t prettyPrintTensor(std::ostream& os, const T* arr, Shape shape, siz
 				os << str << std::string(padding_len, ' ') << (i==size-1 ? "" : ", ");
 			}
 		}
-		//Print the truncated version
+		//Print the truncated version. ex: {1, 1, 1, ... 1, 1, 1}
 		else {
 			//The first half
 			for(intmax_t i=0;i<max_line_content/2;i++) {
@@ -164,7 +164,8 @@ bool Tensor::isSame(const Tensor& other) const
 	if(shape() != other.shape())
 		return false;
 
-	return (*this == other).sum().toHost<int32_t>()[0] == (int32_t)size();
+	//A hacky comparsion
+	return (*this == other).sum().item<int32_t>() == (int32_t)size();
 }
 
 Tensor Tensor::view(svector<Range> ranges) const

Etaler/Core/Tensor.hpp

@@ -210,22 +210,22 @@ struct ETALER_EXPORT Tensor
 	std::shared_ptr<TensorImpl> pimpl_;
 };
 
-static Tensor operator+ (std::variant<float, int, bool> v, const Tensor& t)
+static Tensor operator+ (std::variant<float, int, bool, half> v, const Tensor& t)
 {
 	return std::visit([&t](auto v) {return Tensor(v)+t;}, v);
 }
 
-static Tensor operator- (std::variant<float, int, bool> v, const Tensor& t)
+static Tensor operator- (std::variant<float, int, bool, half> v, const Tensor& t)
 {
 	return std::visit([&t](auto v) {return Tensor(v)-t;}, v);
 }
 
-static Tensor operator* (std::variant<float, int, bool> v, const Tensor& t)
+static Tensor operator* (std::variant<float, int, bool, half> v, const Tensor& t)
 {
 	return std::visit([&t](auto v) {return Tensor(v)*t;}, v);
 }
 
-static Tensor operator/ (std::variant<float, int, bool> v, const Tensor& t)
+static Tensor operator/ (std::variant<float, int, bool, half> v, const Tensor& t)
 {
 	return std::visit([&t](auto v) {return Tensor(v)/t;}, v);
 }

Etaler/Interop/Xtensor.hpp

@@ -21,9 +21,9 @@ xt::xarray<T> to_xarray(const Tensor& t)
 	auto shape = t.shape();
 	std::vector<size_t> s(shape.begin(), shape.end());
 	//Handle the case of bool
-	using DataType = std::conditional<std::is_same<T, bool>, uint8_t, T>::type;
+	using DataType = typename std::conditional<std::is_same_v<T, bool>, uint8_t, T>::type;
 	auto vec = t.toHost<DataType>();
 	return xt::adapt((const T*)vec.data(), s);
 }
 
-}
+}