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.

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

More memory-efficient build process #183

Merged
merged 12 commits into from
Aug 4, 2023
Merged

More memory-efficient build process #183

merged 12 commits into from
Aug 4, 2023

Conversation

Taepper
Copy link
Collaborator

@Taepper Taepper commented Jul 29, 2023

Now by default the symbol of the reference genome is flipped. And we insert the (flipped) data into already flipped bitmaps

# Conflicts:
#	endToEndTests/test/query.test.js
#	include/silo/storage/aa_store.h
#	include/silo/storage/sequence_store.h
#	src/silo/prepare_dataset.cpp
#	src/silo/storage/aa_store.cpp
#	src/silo/storage/database_partition.cpp
#	src/silo/storage/sequence_store.cpp
@Taepper
Copy link
Collaborator Author

Taepper commented Aug 3, 2023

Huh, here we have the tiny problem, that roaring on my local mac and roaring on linux differ in the internal memory usage (and some container types)

@Taepper
Copy link
Collaborator Author

Taepper commented Aug 3, 2023

I changed the numbers to reflect the results for ubuntu. Furthermore, I fixed the memory leaks in Threshold.cpp and thus we can resolve #123

Comment on lines 15 to 23
let response = await server.post('/query').send(testCase.query);
try {
expect(response.status).to.equal(200);
expect(response.header['content-type']).to.equal('application/json');
} catch (error) {
console.error('Error in response header! Error body:', response.body);
throw error;
}
expect(response.body.queryResult).to.deep.equal(testCase.expectedQueryResult);
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, I hope you are okay with these changes, as this helps in debugging failing tests, where before the error message was not displayed, if a successful result was expected.

Comment on lines 15 to 23
let response = await server.post('/query').send(testCase.query);
try {
expect(response.status).to.equal(200);
expect(response.header['content-type']).to.equal('application/json');
} catch (error) {
console.error('Error in response header! Error body:', response.body);
throw error;
}
expect(response.body.queryResult).to.deep.equal(testCase.expectedQueryResult);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't this have the same effect?

Suggested change
let response = await server.post('/query').send(testCase.query);
try {
expect(response.status).to.equal(200);
expect(response.header['content-type']).to.equal('application/json');
} catch (error) {
console.error('Error in response header! Error body:', response.body);
throw error;
}
expect(response.body.queryResult).to.deep.equal(testCase.expectedQueryResult);
let response = await server.post('/query').send(testCase.query);
expect(response.body.queryResult).to.deep.equal(testCase.expectedQueryResult);
expect(response.status).to.equal(200);
expect(response.header['content-type']).to.equal('application/json');

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, yes that looks better with a clearer control flow!

src/silo/storage/aa_store.cpp Outdated Show resolved Hide resolved
src/silo/storage/sequence_store.cpp Show resolved Hide resolved
# Conflicts:
#	endToEndTests/test/info.test.js
#	endToEndTests/test/query.test.js
@Taepper Taepper merged commit 0034775 into main Aug 4, 2023
5 checks passed
@Taepper Taepper deleted the flipBeforeInsert branch August 4, 2023 08:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants