Skip to content

Added new matrix operations #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 2, 2018
Merged

Added new matrix operations #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
167 changes: 167 additions & 0 deletions c_src/Tensorflex.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -852,6 +852,167 @@ static ERL_NIF_TERM load_csv_as_matrix(ErlNifEnv *env, int argc, const ERL_NIF_T
return mat_ret;
}

static ERL_NIF_TERM add_scalar_to_matrix(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
{
ERL_NIF_TERM ret;
unsigned i, j;
mx_t mx, mx_ret;
mx.p = NULL;
mx_ret.p = NULL;

if (!enif_get_resource(env, argv[0], resource_type, &mx.vp)) {
return enif_make_badarg(env);
}

double scalar = 0.0;
if (!enif_get_double(env, argv[1], &scalar)) {
return enif_make_badarg(env);
}

mx_ret.p = alloc_matrix(env, mx.p->nrows, mx.p->ncols);
for (i = 0; i < mx.p->nrows; i++) {
for (j = 0; j < mx.p->ncols; j++) {
POS(mx_ret.p, i, j) = POS(mx.p, i, j) + scalar;
}
}

ret = enif_make_resource(env, mx_ret.p);
enif_release_resource(mx_ret.p);
return ret;
}

static ERL_NIF_TERM subtract_scalar_from_matrix(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
{
ERL_NIF_TERM ret;
unsigned i, j;
mx_t mx, mx_ret;
mx.p = NULL;
mx_ret.p = NULL;

if (!enif_get_resource(env, argv[0], resource_type, &mx.vp)) {
return enif_make_badarg(env);
}

double scalar = 0.0;
if (!enif_get_double(env, argv[1], &scalar)) {
return enif_make_badarg(env);
}

mx_ret.p = alloc_matrix(env, mx.p->nrows, mx.p->ncols);
for (i = 0; i < mx.p->nrows; i++) {
for (j = 0; j < mx.p->ncols; j++) {
POS(mx_ret.p, i, j) = POS(mx.p, i, j) - scalar;
}
}

ret = enif_make_resource(env, mx_ret.p);
enif_release_resource(mx_ret.p);
return ret;
}

static ERL_NIF_TERM multiply_matrix_with_scalar(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
{
ERL_NIF_TERM ret;
unsigned i, j;
mx_t mx, mx_ret;
mx.p = NULL;
mx_ret.p = NULL;

if (!enif_get_resource(env, argv[0], resource_type, &mx.vp)) {
return enif_make_badarg(env);
}

double scalar = 1.0;
if (!enif_get_double(env, argv[1], &scalar)) {
return enif_make_badarg(env);
}

mx_ret.p = alloc_matrix(env, mx.p->nrows, mx.p->ncols);
for (i = 0; i < mx.p->nrows; i++) {
for (j = 0; j < mx.p->ncols; j++) {
POS(mx_ret.p, i, j) = POS(mx.p, i, j) * scalar;
}
}

ret = enif_make_resource(env, mx_ret.p);
enif_release_resource(mx_ret.p);
return ret;
}

static ERL_NIF_TERM divide_matrix_by_scalar(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[])
{
ERL_NIF_TERM ret;
unsigned i, j;
mx_t mx, mx_ret;
mx.p = NULL;
mx_ret.p = NULL;

if (!enif_get_resource(env, argv[0], resource_type, &mx.vp)) {
return enif_make_badarg(env);
}

double scalar = 1.0;;
if ((!enif_get_double(env, argv[1], &scalar)) || (scalar == 0.0)) {
return enif_make_badarg(env);
}

mx_ret.p = alloc_matrix(env, mx.p->nrows, mx.p->ncols);
for (i = 0; i < mx.p->nrows; i++) {
for (j = 0; j < mx.p->ncols; j++) {
POS(mx_ret.p, i, j) = POS(mx.p, i, j) / scalar;
}
}

ret = enif_make_resource(env, mx_ret.p);
enif_release_resource(mx_ret.p);
return ret;
}

static ERL_NIF_TERM add_matrices(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
{
unsigned i, j;
ERL_NIF_TERM ret;
mx_t mx1, mx2, mx;
mx1.p = NULL;
mx2.p = NULL;
mx.p = NULL;

if (!enif_get_resource(env, argv[0], resource_type, &mx1.vp) || !enif_get_resource(env, argv[1], resource_type, &mx2.vp) || mx1.p->nrows != mx2.p->nrows || mx1.p->ncols != mx2.p->ncols) {
return enif_make_badarg(env);
}
mx.p = alloc_matrix(env, mx1.p->nrows, mx2.p->ncols);
for (i = 0; i < mx1.p->nrows; i++) {
for (j = 0; j < mx2.p->ncols; j++) {
POS(mx.p, i, j) = POS(mx1.p, i, j) + POS(mx2.p, i, j);
}
}
ret = enif_make_resource(env, mx.p);
enif_release_resource(mx.p);
return ret;
}

static ERL_NIF_TERM subtract_matrices(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
{
unsigned i, j;
ERL_NIF_TERM ret;
mx_t mx1, mx2, mx;
mx1.p = NULL;
mx2.p = NULL;
mx.p = NULL;

if (!enif_get_resource(env, argv[0], resource_type, &mx1.vp) || !enif_get_resource(env, argv[1], resource_type, &mx2.vp) || mx1.p->nrows != mx2.p->nrows || mx1.p->ncols != mx2.p->ncols) {
return enif_make_badarg(env);
}
mx.p = alloc_matrix(env, mx1.p->nrows, mx2.p->ncols);
for (i = 0; i < mx1.p->nrows; i++) {
for (j = 0; j < mx2.p->ncols; j++) {
POS(mx.p, i, j) = POS(mx1.p, i, j) - POS(mx2.p, i, j);
}
}
ret = enif_make_resource(env, mx.p);
enif_release_resource(mx.p);
return ret;
}

static ErlNifFunc nif_funcs[] =
{
Expand All @@ -877,6 +1038,12 @@ static ErlNifFunc nif_funcs[] =
{ "run_session", 5, run_session },
{ "load_image_as_tensor", 1, load_image_as_tensor },
{ "load_csv_as_matrix", 3, load_csv_as_matrix },
{ "add_scalar_to_matrix", 2, add_scalar_to_matrix },
{ "subtract_scalar_from_matrix", 2, subtract_scalar_from_matrix },
{ "multiply_matrix_with_scalar", 2, multiply_matrix_with_scalar },
{ "divide_matrix_by_scalar", 2, divide_matrix_by_scalar },
{ "add_matrices", 2, add_matrices },
{ "subtract_matrices", 2, subtract_matrices },
};

ERL_NIF_INIT(Elixir.Tensorflex.NIFs, nif_funcs, res_loader, NULL, NULL, NULL)
Expand Down
26 changes: 25 additions & 1 deletion lib/nifs.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ defmodule Tensorflex.NIFs do
@on_load :load_nifs

def load_nifs do
:erlang.load_nif("priv/Tensorflex", 0)
:erlang.load_nif(Application.app_dir(:tensorflex, "priv/Tensorflex"), 0)
end

def create_matrix(_nrows,_ncolumns, _list) do
Expand Down Expand Up @@ -95,4 +95,28 @@ defmodule Tensorflex.NIFs do
raise "NIF run_session/5 not implemented"
end

def add_scalar_to_matrix(_mat, _scalar) do
raise "NIF add_scalar_to_matrix/2 not implemented"
end

def subtract_scalar_from_matrix(_mat, _scalar) do
raise "NIF subtract_scalar_from_matrix/2 not implemented"
end

def multiply_matrix_with_scalar(_mat, _scalar) do
raise "NIF multiply_matrix_with_scalar/2 not implemented"
end

def divide_matrix_by_scalar(_mat, _scalar) do
raise "NIF divide_matrix_by_scalar/2 not implemented"
end

def add_matrices(_mat1, _mat2) do
raise "NIF add_matrices/2 not implemented"
end

def subtract_matrices(_mat1, _mat2) do
raise "NIF subtract_matrices/2 not implemented"
end

end
Loading