Skip to content
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

Jump to bottom

Amesos - fix CSparse class. #12234

Open
wants to merge 13 commits into
base: develop
Choose a base branch
from
+4 −4
Open

Amesos - fix CSparse class. #12234

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f3ff0b5
Merge Pull Request #12150 from trilinos/Trilinos/master_merge_2023081…
trilinos-autotester Aug 19, 2023
5aaae1a
Merge Pull Request #12170 from trilinos/Trilinos/master_merge_2023082…
trilinos-autotester Sep 1, 2023
46e1413
Fix include/ifdef order.
andreili Sep 10, 2023
865bfa9
Merge branch 'master' into master
andreili Sep 10, 2023
d1f042d
Merge Pull Request #12430 from trilinos/Trilinos/master_merge_2023102…
trilinos-autotester Oct 22, 2023
f2813b6
Merge Pull Request #12457 from trilinos/Trilinos/master_merge_2023102…
trilinos-autotester Oct 29, 2023
c4f035c
Merge Pull Request #12482 from trilinos/Trilinos/master_merge_2023110…
trilinos-autotester Nov 4, 2023
58b8b78
Merge Pull Request #12520 from trilinos/Trilinos/master_merge_2023111…
trilinos-autotester Nov 11, 2023
aafd520
Merge Pull Request #12546 from trilinos/Trilinos/master_merge_2023111…
trilinos-autotester Nov 18, 2023
6779ba1
Merge Pull Request #12557 from trilinos/Trilinos/master_merge_2023112…
trilinos-autotester Nov 26, 2023
5d204ff
Merge Pull Request #12596 from trilinos/Trilinos/master_merge_2023121…
trilinos-autotester Dec 11, 2023
e41d378
Merge Pull Request #12609 from trilinos/Trilinos/master_merge_2023121…
trilinos-autotester Dec 16, 2023
987bb33
Merge branch 'master' into master
andreili Dec 21, 2023
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
6 changes: 3 additions & 3 deletions packages/amesos/src/Amesos_CSparse.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
// ***********************************************************************
// @HEADER

#ifdef HAVE_AMESOS_CSPARSE
#include "Amesos_CSparse.h"
#ifdef HAVE_AMESOS_CSPARSE
#include "Epetra_Map.h"
#include "Epetra_Import.h"
#include "Epetra_CrsMatrix.h"
Expand Down Expand Up @@ -134,8 +134,8 @@ int Amesos_CSparse::ConvertToCSparse()

if (Comm().MyPID() == 0)
{
csMatrix.p = (ptrdiff_t *) malloc((SerialMatrix().NumMyRows()+1)*sizeof(ptrdiff_t));
csMatrix.i = (ptrdiff_t *) malloc(SerialMatrix().NumMyNonzeros()*sizeof(ptrdiff_t));
csMatrix.p = (int*)(ptrdiff_t *) malloc((SerialMatrix().NumMyRows()+1)*sizeof(ptrdiff_t));
csMatrix.i = (int*)(ptrdiff_t *) malloc(SerialMatrix().NumMyNonzeros()*sizeof(ptrdiff_t));
csMatrix.x = (double *) malloc(SerialMatrix().NumMyNonzeros()*sizeof(double));
csMatrix.nzmax = SerialMatrix().NumMyNonzeros();
csMatrix.m = SerialMatrix().NumMyRows();
Expand Down
2 changes: 1 addition & 1 deletion packages/amesos/src/Amesos_CSparse.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@

#ifndef AMESOS_CSPARSE_H
#define AMESOS_CSPARSE_H
#ifdef HAVE_AMESOS_CSPARSE

#include "Amesos_ConfigDefs.h"
#ifdef HAVE_AMESOS_CSPARSE
#include "Amesos_BaseSolver.h"
#include "Amesos_NoCopiable.h"
#include "Amesos_Utils.h"
Expand Down