Skip to content

add dtype keyword to loadtxt #500

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 7 commits into from
Feb 1, 2022
Merged

add dtype keyword to loadtxt #500

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
19282b4
add dtype keyword to loadtxt
v923z Jan 29, 2022
e980564
assign array elements via function
v923z Jan 29, 2022
e8c8993
fix array dtype conversion, linalg float constants
v923z Jan 30, 2022
65d6f8e
fix buffer alignment error
v923z Jan 30, 2022
f5f42c3
add skiprows keyword
v923z Jan 31, 2022
9ba136a
fix savetxt comments default value
v923z Jan 31, 2022
6dcad44
extend loadtxt documentation
v923z Feb 1, 2022
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
Prev Previous commit
Next Next commit
fix buffer alignment error
  • Loading branch information
@v923z
v923z committed Jan 30, 2022
commit 65d6f8e947c65dd9bc3abd4ec33696b1148b7e07
59 changes: 34 additions & 25 deletions code/numpy/io/io.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,7 @@ static mp_obj_t io_loadtxt(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw
char *offset;
uint16_t rows = 0, items = 0, all_rows = 0;
uint8_t read;
uint8_t len = 0;

do {
read = (uint8_t)stream_p->read(stream, buffer, ULAB_IO_BUFFER_SIZE - 1, &error);
Expand All @@ -347,6 +348,7 @@ static mp_obj_t io_loadtxt(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw
rows++;
all_rows++;
items++;
len = 0;
if(all_rows == max_rows) {
break;
}
Expand All @@ -358,9 +360,13 @@ static mp_obj_t io_loadtxt(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw
while((*offset == ' ') || (*offset == '\t') || (*offset == '\v') || (*offset == '\f') || (*offset == '\r')) {
offset++;
}
items++;
if(len > 0) {
items++;
len = 0;
}
} else {
offset++;
len++;
}
}
} while((read > 0) && (all_rows < max_rows));
Expand Down Expand Up @@ -394,10 +400,10 @@ static mp_obj_t io_loadtxt(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw

char *clipboard = m_new(char, ULAB_IO_CLIPBOARD_SIZE);
char *clipboard_origin = clipboard;
uint8_t len = 0;

rows = 0;
columns = 0;
len = 0;

size_t idx = 0;
do {
Expand All @@ -421,34 +427,37 @@ static mp_obj_t io_loadtxt(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw
if((*offset == ' ') || (*offset == '\t') || (*offset == '\v') ||
(*offset == '\f') || (*offset == '\r') || (*offset == '\n') || (*offset == delimiter)) {
offset++;
while((*offset == ' ') || (*offset == '\t') || (*offset == '\v') || (*offset == '\f') || (*offset == '\r') || (*offset == '\n')) {
while((*offset == ' ') || (*offset == '\t') || (*offset == '\v') ||
(*offset == '\f') || (*offset == '\r') || (*offset == '\n')) {
offset++;
}
clipboard = clipboard_origin;
#if ULAB_MAX_DIMS == 1
if(columns == cols[0]) {
io_assign_value(clipboard, len, ndarray, &idx, dtype);
}
#else
if(args[4].u_obj == mp_const_none) {
io_assign_value(clipboard, len, ndarray, &idx, dtype);
} else {
for(uint8_t c = 0; c < used_columns; c++) {
if(columns == cols[c]) {
io_assign_value(clipboard, len, ndarray, &idx, dtype);
break;
if(len > 0) {
clipboard = clipboard_origin;
#if ULAB_MAX_DIMS == 1
if(columns == cols[0]) {
io_assign_value(clipboard, len, ndarray, &idx, dtype);
}
#else
if(args[4].u_obj == mp_const_none) {
io_assign_value(clipboard, len, ndarray, &idx, dtype);
} else {
for(uint8_t c = 0; c < used_columns; c++) {
if(columns == cols[c]) {
io_assign_value(clipboard, len, ndarray, &idx, dtype);
break;
}
}
}
}
#endif
columns++;
len = 0;
#endif
columns++;
len = 0;

if(offset[-1] == '\n') {
columns = 0;
rows++;
if(rows == max_rows) {
break;
if(offset[-1] == '\n') {
columns = 0;
rows++;
if(rows == max_rows) {
break;
}
}
}
} else {
Expand Down