GJJ
/
HeteQuadrature
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

debug sparkstack

master
gjj 7 months ago
parent
6c06abe48e
commit
3e3056f3eb
2 changed files with 75 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 90
      algoim/organizer/primitive.hpp
  2. 18
      algoim/sparkstack.hpp

90
algoim/organizer/primitive.hpp
View File

@ -1,9 +1,11 @@
#pragma once
#include <cassert>
#include <cstddef>
#include <vector>
#include "iostream"
#include "multiloop.hpp"
#include "polyset.hpp"
#include "sparkstack.hpp"
#include "uvector.hpp"
#include "real.hpp"
#include "xarray.hpp"
@ -136,33 +138,61 @@ real evalBernstein(const xarray<real, N>& phi, const uvector<real, N>& x)
class PowerTensor : public Primitive
{
public:
xarray<real, 3> tensor;
xarray<real, 3> tensor;
SparkStack<real>* sparkStackPtr;
void print() override { std::cout << "Power" << std::endl; }
real eval(uvector3 p) override { return evalPower(tensor, p); }
PowerTensor() {}
// PowerTensor() {}
PowerTensor(uvector<int, 3> ext_)
{
tensor.ext_ = ext_;
tensor.data_ = nullptr;
sparkStackPtr = algoim_spark_alloc_heap(real, tensor);
xarrayInit(tensor);
}
// PowerTensor(xarray<real, 3> t_) : tensor(t_) {}
PowerTensor(xarray<real, 3> t_) : tensor(t_) {}
~PowerTensor()
{
if (sparkStackPtr) {
sparkStackPtr = nullptr;
algoim_spark_release_heap(sparkStackPtr);
}
}
};
class PowerTensorComplex : public Primitive
{
public:
xarray<real, 3> compositeTensor; // 复合后的张量
std::vector<xarray<real, 3>> tensors; // 原始张量
xarray<real, 3> compositeTensor; // 复合后的张量
SparkStack<real>* sparkStackPtr;
// std::vector<xarray<real, 3>> tensors; // 原始张量
std::vector<PowerTensor> tensors; // 原始张量
void print() override { std::cout << "PowerTensorComplex" << std::endl; }
PowerTensorComplex() {}
// PowerTensorComplex() {}
PowerTensorComplex(const std::vector<xarray<real, 3>>& ts_) : tensors(ts_)
{
uvector3 ext(1, 1, 1);
for (auto& t : ts_) { ext += t.ext() - 1; }
compositeTensor.ext_ = ext;
algoim_spark_alloc(real, compositeTensor);
sparkStackPtr = algoim_spark_alloc_heap(real, compositeTensor);
detail::compositePower(tensors, 0, uvector3(0, 0, 0), 1, compositeTensor);
}
PowerTensorComplex(const std::vector<PowerTensor>& pts_)
{
uvector3 ext(1);
for (auto& pt : pts_) { ext += pt.tensor.ext() - 1; }
compositeTensor.ext_ = ext;
sparkStackPtr = algoim_spark_alloc_heap(real, compositeTensor);
detail::compositePower(tensors, 0, uvector3(0, 0, 0), 1, compositeTensor);
}
@ -178,7 +208,7 @@ public:
ext += pc.compositeTensor.ext() - 1;
}
compositeTensor.ext_ = ext;
algoim_spark_alloc(real, compositeTensor);
sparkStackPtr = algoim_spark_alloc_heap(real, compositeTensor);
detail::compositePower(originCompositeTensors, 0, uvector3(0, 0, 0), 1, compositeTensor);
}
@ -211,26 +241,27 @@ public:
PowerTensorComplex makeMesh(const std::vector<uvector3>& vertices, const std::vector<uvector<int, 3>>& indices)
{
PowerTensorComplex pc;
uvector3 ext(1, 1, 1);
uvector3 ext(1 + indices.size());
// PowerTensorComplex pc(ext);
std::vector<PowerTensor> pts;
for (const auto& index : indices) {
xarray<real, 3> tensor(nullptr, uvector3(2)); // 最高1次
algoim_spark_alloc(real, tensor);
xarrayInit(tensor);
uvector3 V01 = vertices[index(1)] - vertices[index(0)];
uvector3 V02 = vertices[index(2)] - vertices[index(0)];
uvector3 N = cross(V01, V02);
N /= norm(N);
real d = -dot(N, vertices[index(0)]);
// xarray<real, 3> tensor(nullptr, ); // 最高1次
// algoim_spark_alloc(real, tensor);
PowerTensor pt(uvector3(2));
uvector3 V01 = vertices[index(1)] - vertices[index(0)];
uvector3 V02 = vertices[index(2)] - vertices[index(0)];
uvector3 N = cross(V01, V02);
N /= norm(N);
real d = -dot(N, vertices[index(0)]);
// 法线所指方向为>0区域
tensor.m(uvector3(0, 0, 0)) = d;
tensor.m(uvector3(1, 0, 0)) = N(0);
tensor.m(uvector3(0, 1, 0)) = N(1);
tensor.m(uvector3(0, 0, 1)) = N(2);
pc.tensors.push_back(tensor);
ext += tensor.ext() - 1;
pt.tensor.m(uvector3(0, 0, 0)) = d;
pt.tensor.m(uvector3(1, 0, 0)) = N(0);
pt.tensor.m(uvector3(0, 1, 0)) = N(1);
pt.tensor.m(uvector3(0, 0, 1)) = N(2);
pts.push_back(pt);
}
PowerTensorComplex pc(pts);
pc.compositeTensor.ext_ = ext;
algoim_spark_alloc(real, pc.compositeTensor);
detail::compositePower(pc.tensors, 0, 0, 1, pc.compositeTensor);
@ -239,11 +270,8 @@ PowerTensorComplex makeMesh(const std::vector<uvector3>& vertices, const std::ve
PowerTensor makeSphere(const real r, const uvector3& c = 0, const uvector3& a = 1)
{
PowerTensor pt;
uvector<int, 3> ext = 3;
pt.tensor.ext_ = ext;
algoim_spark_alloc(real, pt.tensor);
xarrayInit(pt.tensor);
PowerTensor pt(ext);
for (int dim = 0; dim < 3; ++dim) {
uvector<int, 3> idx = 0;
@ -259,9 +287,9 @@ PowerTensor makeSphere(const real r, const uvector3& c = 0, const uvector3& a =
PowerTensor makeCylinder(uvector3 startPt, uvector3 endPt, real r)
{
PowerTensor pt;
// PowerTensor pt;
// TODO:
return pt;
return PowerTensor({});
}
class BernsteinPrimitive : public Primitive

18
algoim/sparkstack.hpp
View File

@ -29,8 +29,15 @@ class SparkStack
<< __FILE__ << '\n';
throw std::bad_alloc();
}
*ptr = base() + pos();
std::cout << "Before alloc, the **ptr pointing to nullptr is not nullptr: " << ptr << std::endl;
*ptr = base() + pos();
std::cout << "pos before += len:" << pos() << std::endl;
pos() += len;
std::cout << "pos after += len:" << pos() << std::endl;
std::cout << "base: " << base() << std::endl;
std::cout << "ptr: " << ptr << std::endl;
std::cout << "*ptr: " << *ptr << std::endl;
std::cout << "==========" << std::endl;
if constexpr (sizeof...(rest) == 0)
return len;
else
@ -90,7 +97,11 @@ public:
}
// Release memory when the SparkStack object goes out of scope
~SparkStack() { pos() -= len_; }
~SparkStack()
{
pos() -= len_;
std::cout << "Here!" << std::endl;
}
};
#define algoim_CONCAT2(x, y) x##y
@ -99,6 +110,9 @@ public:
#define algoim_spark_alloc_def(T, val, ...) SparkStack<T> algoim_CONCAT(spark_alloc_var_, __LINE__)(val, __VA_ARGS__)
#define algoim_spark_alloc_vec(T, ptr, ext) SparkStack<T> algoim_CONCAT(spark_alloc_var_, __LINE__)(ptr, ext)
#define algoim_spark_alloc_heap(T, ...) new SparkStack<T>(__VA_ARGS__)
#define algoim_spark_release_heap(SparkStackPtr) delete SparkStackPtr
} // namespace algoim
#endif

Write Preview
Loading…
Cancel
Save